Added birthday to EditProfileGUI
Merge branch 'EditProfileGUI'

Conflicts:
	res/layout/activity_edit_profile.xml
	res/values/strings.xml