log4j test complete
Merge branch 'dev'