Merge origin/master

Conflicts:
	www/js/controllers.js
Merge origin/master