user role fixes
Merge branch 'master' of git://github.com/CondeNast/pangea

merge