Added some more string identifiers for use in manageAccount fragment in
the string.xml
some of the ids were changed when i refactored the names.
switched up the gui set up. Now there is a location to put in the
current password/email and then type in the new password and email to
update.
resolved conflicts in my master branch
fixed merge conflicts in master branch xml