Merge pull request #66 from tanay1337/master

Fixes Bug 1040127 - Change save icon on edit profile to the word "Save"
Fixed Bug 1011295