Merge remote-tracking branch 'origin/master'

Conflicts:
	js/controllers.js