fjij
Merge branch 'master' of https://github.com/shai1312/fproj

Conflicts:
	proj/res/layout/activity_edit_profile.xml
	proj/src/com/example/proj/EditProfile.java
rrr