Admin controls added to user profile pages
Merge remote-tracking branch 'origin/master'