modify log file name
Merge branch 'master' of ssh://git@github.com/aigps/wqServer

Conflicts:
	src/main/java/log4j.properties