Merge branch 'v.0.4.0'

Conflicts:
	README.md
	app.js
	client-side/init/index.html
	client-side/src/docs/index.html
	client-side/src/docs/plugins/index.src
	client-side/src/docs/spec/info.json
	client-side/src/docs/starting/index.html
	client-side/src/docs/starting/info.json
	core/clarify/css/mobile.css
	core/file-tree/index.js
	package.json

Author: robhrt7

.gitignore

@@ -1,21 +1,11 @@
-.*
-*.dat
+*.idea
 *.iml
-tmp
+*.DS_Store
 node_modules
 
-# Build folder fo ftp deploy
+# Build folder for assets
 /build
 
-# Git ignore fo initing
-!/client-side/init/.gitignore
-
-# Custom client-side plugins folder, managed with volo packet manager
-/client-side/plugins
-
-# Custom user folder for Source server side
-/user
-
 # Web server root, and your specs home
 # You can store other repository in this path
-/public
+/user