[build]build for deploy
[build]Merge commit '5c26ad5ed4df1b71311f051cc7c98a8387fd5c71'

Conflicts:
	build/css/main.css
	build/index.html
	build/js/app.js
	build/js/main.js
Split 'build/' into commit '5631da4543cfdbbb9e08d7d75abbcf8d3632cc39'

git-subtree-dir: build
git-subtree-mainline: 8f3b320dcc7b649542ddca2f3020809d52700c42
git-subtree-split: 5631da4543cfdbbb9e08d7d75abbcf8d3632cc39
build for deploy