organized xml strings
changed variable names for AddAccountActivity
merge
Merge remote-tracking branch 'origin/development' into development