Add failover for elasticsearch if there are other nodes in the cluster
Merge branch 'two-dot-o' of https://github.com/fbicak/usergrid into two-dot-o
Comply with the indentation used inside Chop module
Support different cluster names for ElasticSearch
Comply with the indentation used inside Chop module
Initial API refactor for prefix scanning on types.
Updated tests and implementation for type prefix scanning
Fix scheduler test 8.
Merge pull request #180 from GERey/USERGRID-162_import-counters

Usergrid 162 import counters
Added extra param to relation manager
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
Merge pull request #177 from fbicak/two-dot-o

Two dot o
Restoring CP based implementations which were incorrectly commented out by previous greyes commit.
Some progress in getting Services module tests working with Core Persistence.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-162_import-counters

# By Furkan Bicak (4) and others
# Via Dave Johnson (2) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Some progress in getting Services module tests working with Core Persistence.
  Restoring CP based implementations which were incorrectly commented out by previous greyes commit.
  Added extra param to relation manager
  Fix scheduler test 8.
  Updated tests and implementation for type prefix scanning
  Initial API refactor for prefix scanning on types.
  Comply with the indentation used inside Chop module
  Support different cluster names for ElasticSearch
  Comply with the indentation used inside Chop module
  Add failover for elasticsearch if there are other nodes in the cluster

Conflicts:
	stack/core/src/main/resources/usergrid-core-context.xml