Merge branch 'master' into alex-test

Conflicts:
	app.js