Merge origin/master

Conflicts:
	app/js/app.js