POM.XML
Merge branch 'master' of https://github.com/feihuwang/ab_pc_cms.git

Conflicts:
	pom.xml