处理类路径文件冲突
Merge branch 'master' of https://github.com/sethwolf/beifengbpm.git

Conflicts:
	beifengbpm/.classpath