Fixing route error
Changing back to merge full change without conflict(?)
Merge branch 'uat' of https://github.com/Sage-Bionetworks/BridgePF into uat
Merge tag 'release-20141016' into uat
Small changes for the day based on use of SDK. Most importantly, removed an unnecessary REST endpoint from the UserManagement Controller.
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into develop
Adding ResourceList type to the arrays returned from the REST API
Merge pull request #282 from alxdarksage/add-type-to-lists

Add type to lists
Merge pull request #283 from Sage-Bionetworks/uat

Merge uat back to develop
Key pair factory and RSA encryptor
Clean up for pull request
Merge pull request #284 from eric-wu/develop

RSA 2048-bit key pair factory and encryptor
Updating Stormpath libraries; creating a more resilient method of polling for eventual consistency during write/read tests.
Merge pull request #285 from alxdarksage/develop

Updating Stormpath libraries; creating a more resilient method of pollin...
Ignoring tests that are now done by the SDK.
Doubling the number of times we try; Travis seems to be slower
Slowing down retries
Merge pull request #286 from alxdarksage/develop

Slowing down retries.
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into controller-tests
Merge pull request #287 from alxdarksage/controller-tests

Disabling tests that are now in the SDK