Merge
Merge localOrigin/master

Conflicts:
	www/js/controllers.js