Changed edge interface to have timestamps on the edge.
Changed edge interface to have timestamps on the edge.
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