updatEemail
Merge branch 'user' of https://github.com/alex3165/hackcessangels into user

Conflicts:
	ios/hackcessangels/hackcessangels/services/HAUserService.h
	ios/hackcessangels/hackcessangels/services/HAUserService.m