-
Merge branch 'master' into HEAD

Conflicts:
	js/app.js
Merge commit '2bb790a'