Merge pull request #78 from habuma/master

Merged Spring Security integration work (work in progress)
Merge pull request #79 from habuma/master

Sync up on security integration work and updates to dependencies.