Merge pull request #23 from dianping/master

sync
log4j
fix IO-297 in our inner version and rotate bug
Merge pull request #47 from LantaoJin/master

log4j plus to comma