commit
Merge branch 'master' of https://github.com/pangdodo/PAMS

Conflicts:
	deploy/pams/WebContent/WEB-INF/applicationContext.xml
commit
commit