Merge pull request #110 from alxdarksage/develop

Fixing tests (updating to API changes, fix bad merge)
Updating to Spring 4.0.2, plus other updates to keep integration testing working.