update
Merge branch 'master' of https://github.com/gongwq119/learn.web.git

Conflicts:
	com.gongwq.php1/view/simpleView.php
	com.gongwq.php1/web/index.php
up
Merge branch 'master' of https://github.com/gongwq119/learn.web.git
update
update