项目提交
Merge branch 'master' of https://github.com/2012gaibai/Project.git

Conflicts:
	logs/log4j/appLog