forgot password
forgot password
Merge branch 'develop' of https://github.com/pasangsherpa/sunappugram into develop

Conflicts:
	sunappugram/res/layout/login.xml
	sunappugram/res/values/strings.xml
	sunappugram/src/com/sunappugram/SunappuGram.java
Merge branch 'develop' of https://github.com/pasangsherpa/sunappugram into develop