modify pom
Merge branch 'master' of https://oqy@github.com/oqy/webapp-core.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml