fix dependency and unit test from portal-core sync
Reverting changes to gitignore
fix spring security dependency conflict
Merge pull request #5 from victortey/master

Looks good to me