User profile update
Merge pull request #849 from sexnothing/develop

User profile update