change build tool to build in dist and move index.html at root
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	index.html
change build dir from build to dist