got email working for sign up
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/SignUpActivity.java