调整工程参数
Merge branch 'master' of https://github.com/mymmsc/java-j2ee

Conflicts:
	.classpath