no message
Merge branch 'master' of https://github.com/szizza/SBC

Conflicts:
	SBCMobileClient/www/js/controllers/userlogin.js
	SBCMobileClient/www/js/services/authentication.js