done
Merge pull request #126 from geekhub-php/merge-contribut-in-user-profile

done merge-contribut-in-user-profile
Merge branch 'develop' into merge-in-edit-user