Version 1.0
Merge branch 'master' into gh-pages

Conflicts:
	assets/js/app.js
	index.html