change the ire to 8
Merge branch 'master' of https://github.com/hyjlw/app-server

Conflicts:
	.classpath