Merge pull request #137 from hopesfish/dev

fix bugs
Merge pull request #138 from hopesfish/dev

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

Conflicts:
	web/src/main/webapp/WEB-INF/spring-mvc.xml
修改上传绘图部分线程池数量
Merge pull request #127 from pengqin/dev

Dev