Merge origin/master

Conflicts:
	www/js/controllers.js
	www/js/languages/english.js
	www/js/languages/french.js