added the final edit account
Merge remote-tracking branch 'origin/RealEdit'

Conflicts:
	GitWarriorSolution/res/layout/activity_main.xml
	GitWarriorSolution/res/layout/layout_edit_account.xml
	GitWarriorSolution/src/com/example/gitwarriorsolution/EditAccount.java