心电图识别over
Merge remote-tracking branch 'origin/master'

Conflicts:
	HealthSLife/AndroidManifest.xml
	HealthSLife/src/com/healthslife/healthtest/ECGAnalysis.java
	HealthSLife/src/com/healthslife/healthtest/EcgFragment.java
	HealthSLife/src/com/healthslife/healthtest/EcgTakePicActivity.java