Changed edge interface to have timestamps on the edge.
Changed edge interface to have timestamps on the edge.
check for nulls
Revert "Missed null check may cause NPE"

This reverts commit 54735519943819e32df9aadcb81e9142f32e4cef.
removing simpleroleref
merge
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into Usergrid-158/Can-use-roles
Merge pull request #174 from GERey/master

Revert "Missed null check may cause NPE"
Merge branch 'master' into two-dot-o
All tests pass with new long timestamp
Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-154

Conflicts:
	stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixObservable.java
Work to get services module tests working.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Longs for versions instead of time UUIDs.
Upgraded to ES 1.2.0.

Updated remote node client during discovery.
Merge branch 'performance-fixes' into two-dot-o

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
Merged remote fixes
Fix test failures, clean up imports.
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