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
User the new AES encryptor for new accounts.
Merge pull request #278 from alxdarksage/develop

Build fixes
Merge pull request #280 from alxdarksage/develop

Refactoring use of TestUserAdminHelper
Merge pull request #279 from eric-wu/develop

User the new AES encryptor for new accounts
Change the encryptor to use keys
Add key to the new AES GCM encryptor
Remove debugging output
Upgrade Stormpath
Merge pull request #281 from eric-wu/develop

Fix test failures caused by the new encryptor
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