check for nulls
removing simpleroleref
merge
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into Usergrid-158/Can-use-roles
adding majority of methods back to cpentitymanager
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into Usergrid-158/Can-use-roles
adding rest of groups and roles f(x)
remove comment
remove logging, refresh index
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into Usergrid-158/Can-use-roles
Merge pull request #176 from usergrid/Usergrid-158/Can-use-roles

Usergrid 158 - add roles/permissions methods back