Now you will be prompted to create a profile if you dont have one, and you can't create profile without name/ same name / without loc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/controllers.js