Merge branch '1.0' into 1.1

Zhen · Zhen · commit 31f1fa97c87a · 2016-07-08T17:16:23.000+02:00
diff --git a/neokit b/neokit
@@ -1 +1 @@
-Subproject commit 6506ce944a47f78e071f49b600df588a3fe91e28
+Subproject commit f364e6157d2bf97a3f100618664b388ae7670200
