Fixed unit tests
Merge branch 'master' into test_fixes

Conflicts:
	grails-app/services/net/kaleidos/grails/plugin/security/stateless/StatelessService.groovy
	test/unit/net/kaleidos/grails/plugin/security/stateless/StatelessServiceSpec.groovy
Merge branch 'test_fixes'