Merge branch 'master'

Conflicts:
	js/app.js
merge