modify a lot of things...
Merge branch 'master' of https://github.com/daoyuan14/MeasureApp

Conflicts:
	NetTester/src/edu/nettester/db/MeasureDBHelper.java