gh-pages init
Merge branch 'develop'
Merge branch 'master' into gh-pages

Conflicts:
	package.json
remove index.html
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
+ sort-keys
Merge branch 'gh-pages' into develop