tt
doc
Merge branch 'dev' of https://github.com/pengqin/ecgplatform into dev

Conflicts:
	web/src/main/webapp/WEB-INF/spring-mvc.xml