More progress on getting test to pass with Core Persistence, also allow forked C* and ES for Core and Services modules.
More progress on getting REST tests passing with Core Persistence, now down to 12 tests not passing.
More progress on getting REST tests passing with Core Persistence, plus some config necessary to get better logging out of Jersey.
Removing outdated perftest projects for now.
More progress on getting REST tests going in the two-dot-o branch, marked some tests as @Ignore and opened JIRA issues to fix them later.
Fix for problem in unique values implementation in Core Persistence, and tests to verify new fix.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'master' into two-dot-o. Also making log configs consistent.

Conflicts:
	.gitignore
	portal/dist/usergrid-portal/index-debug.html
	portal/dist/usergrid-portal/index-template.html
	portal/dist/usergrid-portal/index.html
	portal/dist/usergrid-portal/js/libs/usergrid-libs.min.js
	portal/dist/usergrid-portal/js/libs/usergrid.sdk.js
	portal/dist/usergrid-portal/js/usergrid-dev.min.js
	portal/dist/usergrid-portal/js/usergrid.min.js
Couple more Core Persistence test fixes.
Ignore failing test until it is fixed via associated JIRA issue.