check for nulls
removing simpleroleref
merge
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into Usergrid-158/Can-use-roles
Changed error to warning
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o

Conflicts:
	stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/consistency/AsyncProcessorImpl.java
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
RAT ignore for Vagrant temp files
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
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
Merge branch 'two-dot-o' into corepersistence-off