bug on Edit profile
Merge remote-tracking branch 'upstream/master' into working
Merge pull request #57 from Konviser/master

bug on Edit user profile