ken
Merge branch 'master' of https://github.com/mingsheng88/RunningMon.git

Conflicts:
	assets/www/DBTEST.HTML