only add user caps in the admin dashboard context
Merge branch 'master' into buddypress
Merge remote-tracking branch 'infinity/buddypress'