fix dependency and unit test from portal-core sync
Reverting changes to gitignore
fix spring security dependency conflict
Merge pull request #15 from terryrankine/fix-tests

Fix tests  (Cheers Victor)
Merge branch 'master' of https://github.com/AuScope/VHIRL-Portal into devel