Merge origin/master

Conflicts:
	www/js/app/views/Home.js