Update pom.xml
Merge pull request #120 from hopesfish/dev

update
Merge branch 'dev' of https://github.com/hopesfish/ecgplatform into hopesfish-dev

Conflicts:
	api/pom.xml
Merge pull request #129 from hopesfish/pengqin-dev

Pengqin dev
Merge pull request #121 from pengqin/dev

Update pom.xml