fixed issue where user profile was not displaying
Merge branch 'master' into bugz