Updated POM
Merge branch 'master' of https://github.com/EaseTech/easytest-spring

Conflicts:
	pom.xml