a
Merge branch 'master' of https://github.com/wellingfine/easyphp

Conflicts:
	lib/db/db.php
Merge branch 'master' of https://github.com/wellingfine/easyphp
Merge branch 'master' of https://github.com/wellingfine/easyphp
增加一种路由配置demo