Merge branch 'master' of https://github.com/mohdfarhanakram/DatingApp

Conflicts:
	src/com/digitalforce/datingapp/view/LoginActivity.java
	src/com/digitalforce/datingapp/view/MyPictureActivity.java
	src/com/digitalforce/datingapp/view/SignUpActivity.java