rebase error
remove some unuse dependency
Merge branch 'master' of https://github.com/zxcwindy/service.git

Conflicts:
	src/main/webapp/WEB-INF/decorators.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/developMode/develop.js
添加proxool数据库
连接池从容器转为自带
remove glassfish