page method of ajax not completed yet
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo.php
	page.class.php