'Edit Profile' changed to 'Account Settings'
Merge remote-tracking branch 'origin/master'