Added user profile editing abilities
Merge remote-tracking branch 'origin/master'