update
Merge branch 'master' of https://github.com/winkingju/commt

Conflicts:
	target/classes/log4j.xml