fixbug
添加page.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	global.php
	page.php