dist target now adds log4j and its settings to jar
Merge issues.
fix merge issues