config log4j
Merge branch 'dev' of https://github.com/miaofch/tokyo_hot.git into dev

Conflicts:
	config/log4j.properties