Updating user profile stuff
Merge branch 'master' of https://github.com/stevejmason/TrainingProject-1