app.js => app.min.js
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	src/html/index.html