ensure that timeuuid timestamps do not collide under high contention
formatting, dupe code cleanup on test methods
minor formatting tweak
Added overloaded form for app-specified timestamp. Addresses USERGRID-1292
Merge pull request #66 from apigee/timeuuid-guarantee

Timeuuid guarantee
Add ability to declaratively encrypt a field through annotation. Key has a hard-coded default that can be overridden as a System property (encryptionSeed).
Merge pull request #78 from apigee/USERGRID-1327

Add ability to declaratively encrypt a field through annotation.
fixed borked test case on timeuuidutils
Updated tool to allow forced password set
json non-null inclusion tag for device receipts collection
Added additional logging

USERGRID-1348
Load EntityRefs where possible instead of Entities to try to avoid unnecessary loading of properties, minor reordering of calls to optimize same. Further optimization will likely require deeper exploration of RelationshipManager's use of properties, but these changes should help localize that.
Merge pull request #83 from apigee/USERGRID-1328

Load EntityRefs where possible instead of Entities
Fixed run loop error handling.

Fixed migration of column families to be explicitly checked and loaded.
This way migrations can be triggered for new CFs via REST.

USERGRID-1348
Merge pull request #84 from apigee/USERGRID-1348

Usergrid 1348
Added tool to dump output of duplicate admins

USERGRID-1340
File rename

USERGRID-1340
Added new class for duplicate org repair

USERGRID-1351
added correct portal URL, made static
Merge pull request #85 from apigee/launcher-restart

added correct portal URL, made static