log4j properties for testing
Merge branch 'master' of github.com:atomfrede/freezing-octo-bear