deal conflict
Merge branch 'master' of https://github.com/Incoding/service

Conflicts:
	src/main/webapp/WEB-INF/web.xml
deal conflict