data role
Merge branch 'master' of github.com:antme/pms

Conflicts:
	service/src/main/webapp/WEB-INF/applicationContext.xml
fix bugs