Rewrite testGeo() to test via queries rather than the GeoIndexSearcher thing and re-enable the test (by removing the @Ignore annotation).
New GeoQueryOrTest to test using or in a geo query.
Add ArrayField to Mvcc serialization test and default constructor to ArrayField.
Fix for the way that arrays are serialized by JSON and a test to verify that arrays work as expected.
Fixes for new tests brought in for master.
uuid fixes, adding serialization fixes
abstract uuid creation
remove extra ref
add uuid long method
Move to ElasticSearch 1.2.4 and comment out query validator for now, see USERGRID-221.
More test fixes related to merge from master and previous serialization fix.
Merge branch 'pr/70' into two-dot-o
Fix JSON mapper to use same setup as we do in Collections module serializer.
Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into two-dot-o
Reverting previous change; jumped the gun on that one.
Merge remote-tracking branch 'apache/two-dot-o' into USERGRID-188

Conflicts:
	stack/corepersistence/pom.xml
Fixed obscelete tests