moving mock query and changing entity ref
uuid fix
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java