Merge pull request #34 from dennishendriksen/master

Fix security config
prevent log4j.properties conflicts, remove old log4j.properties