user roles and capabilities update
Merge branch 'master' of git://github.com/CondeNast/pangea

merge