Merge branch 'baiphp_dev' of https://github.com/baidi/BaiPHP.git into baiphp_dev

Conflicts:
	bai/php/Page.php
	bai/php/config.php