cody tidy-up
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
	js/app.js