Merge branch 'master-pre-merge'

.github/issue_template.md

@@ -1,12 +1,20 @@
-_Before filing a new issue, please **provide the following information**._
-
-> I'm running:
->
-> - **Which Aion version?**: 0.2.x.{git-revision}
-> - **Which operating system?**: Linux
-> - **Which distributor and version?**: Ubuntu 16.04
-> - **How installed?**: via binaries / from source
-> - **Are you fully synchronized?**: no / yes
-> - **Did you try to restart the node?**: no / yes
-
-_Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
+<!-- 
+  For Documentation related Issues please use: 
+    https://github.com/aionnetwork/docs/issues/new/choose
+-->
+
+## Description
+<!-- Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue. -->
+
+## System Information
+
+<!-- please **provide the following information**. -->
+
+I'm running:
+
+- **Which Aion version?**: 0.2.x.{git-revision}
+- **Which operating system?**: Linux
+- **Which distributor and version?**: Ubuntu 16.04
+- **How installed?**: via binaries / from source
+- **Are you fully synchronized?**: no / yes
+- **Did you try to restart the node?**: no / yes

.gitignore

@@ -13,6 +13,7 @@
 /mod*/.idea/
 /mod*/*.iml
 ij-execution.out
+/3rdParty/*/out/
 /*/out
 
 # build

.gitmodules

@@ -1,8 +1,11 @@
 [submodule "aion_fastvm"]
     path = aion_fastvm
     url = https://github.com/aionnetwork/aion_fastvm
-    branch = master 
-[submodule "aion_api"]
-    path = aion_api
-    url = https://github.com/aionnetwork/aion_api
     branch = master
+[submodule "aion_gui"]
+	path = aion_gui
+	url = https://github.com/aionnetwork/aion_gui
+[submodule "aion_vm_api"]
+	path = aion_vm_api
+	url = https://github.com/aionnetwork/vm_api.git
+	branch = dev