Log4J config
Merge branch 'dev_server_config'