Optimizing app.js size, and using uglify for production
Merge branch 'master' into gh-pages

Conflicts:
	dist/js/app.js