simplify annotations using bean scoping, fix search security interceptor
Merge pull request #294 from dennishendriksen/master

Simplify annotations using bean scoping, fix search security interceptor