Reformatted the UserResourceIT  and added a test to prove issue.
Removed the index checking from uuid checking
NPE may be thrown if the org admin identifier doesn't exist
Merge pull request #165 from GERey/user_uuid_query_fix

Reformatted the UserResourceIT  and added a test to prove issue.
Changed edge interface to have timestamps on the edge.
building release; adding new error event
Changed edge interface to have timestamps on the edge.
add @ symbol
Merge pull request #171 from usergrid/unlock-query-button

Unlock query button
Missed null check may cause NPE
fix profile call
Merge pull request #172 from usergrid/Usergrid-159-fix-profile

ug-159:fix profile call
add reload and * to connect task
add reload and * to connect task
Merge pull request #173 from usergrid/change-portal-server-config

Change portal server config
Move property roles to correct locations, adding Hystrix property file config.properties, better ensure consistent usage of COLLECTION_SUFFIX.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Ignored test the highlights users not being fullQueryIndexed
Merge pull request #175 from GERey/fix-to-UserResource-test

Ignored test the highlights users not being fullQueryIndexed
Ensure consistent usage of edge connection type, fix duplicate property value tests.
Merge branch 'master' into two-dot-o

Conflicts:
	portal/dist/usergrid-portal/config.js
	portal/dist/usergrid-portal/js/libs/usergrid-libs.min.js
	portal/dist/usergrid-portal/js/usergrid-dev.min.js
	portal/dist/usergrid-portal/js/usergrid.min.js
	stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java