integrate Miu's login function
Merge branch 'newtemplate' of https://github.com/EVRI-TEAM/Evri_Giver-Mobile-App into newtemplate

Conflicts:
	setup.bat
	setup.sh
	www/js/controllers.js