Added some fixes from findbugs
Merge branch 'master' of github.com:tarjeir/vitus-elasticsearch-webintegration