html modified
Merge branch 'master' of https://github.com/jyd519/myiosapp

Conflicts:
	TestDriver/test/test/init.html