Merge pull request #34 from dennishendriksen/master

Fix security config
prevent log4j.properties conflicts, remove old log4j.properties
Merge pull request #35 from dennishendriksen/master

Prevent log4j.properties conflicts, remove old log4j.properties
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines into feature/studydefinitionservice
changes due to catalog service changes