Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Shawn Feldman (14) and others
# Via Dave Johnson (7) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (34 commits)
  Fix for EntityManagerIT testCorrectType() test, and some compilation errors in other modules.
  remove subscribeson
  change back to single record iterator
  testcreateanddelete is now passing
  PathQueryIT tests now working.
  Wrapping up the one query parser work.
  USERGRID-149 Closing URLClassLoader after using in CoordinatorUtils
  Adding status commit, so we know if something is deleted
  Everything compiles with one Query class, except for things that need query.getSelectionResult().
  Remove unnecessary imports
  Add an option for webapp to use an existing Elasticsearch instance or cluster
  Also move Query tree into Core Persistence compatible package.
  Refactor so that Query is in same package as in Core Persistence.
  Scheduler test fix.
  USERGRID-150 setting data center before destroying stack instances
  More progress on CpEntityManager tests.
  exporting also private ip list and private hostname list
  fix null reference
  exporting instance IPs and host names as a space separated list with ClusterName suffixed by _HOSTS and _ADDRS
  Add missing license headers
  ...
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Dave Johnson (9) and others
# Via Todd Nine (2) and Dave Johnson (1)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Update README.md
  Update README.md
  Update README.md
  Add support for getSelectionResults() to QueryUtils because the queryindex module does not know about Results.
  Couple more attempts to get Hystrix to process its own properties.
  An attempt to iterating query get tests going using a write delay.
  Hook in Hystrix for collections module and some reasonable starting settings, cassandra.connections=500 and hystrix.threadpool.user.coreSize=100.
  comments++
  move listeners to core
  fix markcommit
  Fixes hystrix version
  Renamed the Hystrix circuit breakers
  fix load and delete test, add unique values back, fix relation manager test
  Minor formatting changes and license header additions.
  Fix Query so that it does now lower-case the entire query string.
  Updated guide modules to re-use the core persistence better.
  Renames status to state so that it is easier to read compared with stage.  State signifies the entity state.
  Queue rework.
  Updated tests and modules to use timeout factories.  Local only implemented first pass.
Added most counter methods.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into DPS-1042_import-counters

# By Martin Harris (2) and grey (1)
# Via Dave Johnson (2) and grey (2)
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Got all existing Dictionary tests to work using the old hector dictionary code. Added batchUpdateSetIndexes and all methods needed to make it work into CpRelationManager.
  Added names to corepersistence modules
  Added corepersistence module to stack pom.xml

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
Added in mutator logic
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into DPS-1042_import-counters

# By Shawn Feldman (5) and others
# Via Dave Johnson (4) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Ensure consistent usage of edge connection type, fix duplicate property value tests.
  Ignored test the highlights users not being fullQueryIndexed
  Move property roles to correct locations, adding Hystrix property file config.properties, better ensure consistent usage of COLLECTION_SUFFIX.
  add reload and * to connect task
  add reload and * to connect task
  fix profile call
  Missed null check may cause NPE
  add @ symbol
  building release; adding new error event
  NPE may be thrown if the org admin identifier doesn't exist
  Reformatted the UserResourceIT  and added a test to prove issue. Removed the index checking from uuid checking
  Added common Eclipse IDE files to .gitignore

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
Subsituting the old entity manager to check to see what keyspaces are written.
Fixed two out of three counters tests.
Re added the CPEntityManager.
Revert "Fixed two out of three counters tests."

This reverts commit c18df540d878457911ed13a20a0dbec12b46106b.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into DPS-1042_import-counters

# By Shawn Feldman (6) and others
# Via Dave Johnson (6) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  All EntityConnectionsIT tests now passing.
  RAT ignore for Vagrant temp files
  remove logging, refresh index
  remove comment
  adding rest of groups and roles f(x)
  adding majority of methods back to cpentitymanager
  Changed error to warning
  Fix test failures, clean up imports.
  Merged remote fixes
  Upgraded to ES 1.2.0.
  Longs for versions instead of time UUIDs.
  Work to get services module tests working.
  All tests pass with new long timestamp
  removing simpleroleref
  Revert "Missed null check may cause NPE"
  check for nulls
  Changed edge interface to have timestamps on the edge.
  Changed edge interface to have timestamps on the edge.

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
Reformatted the code.
Merge pull request #180 from GERey/USERGRID-162_import-counters

Usergrid 162 import counters