Done (with version 1)!
Merge branch 'master' into gh-pages

Conflicts:
	js/app.js

Fixing an earlier commit on the wrong branch as well as final merge.