no message
Merge branch 'master' of https://github.com/ajency/Minyawns-Ionic-App

Conflicts:
	www/templates/loginView.html