fix config database
Merge branch 'master' of https://github.com/unisexx/ppt
Merge branch 'master' of https://github.com/unisexx/ppt
update menu use from db and check permission
fix config db
Merge branch 'master' of https://github.com/unisexx/ppt

Conflicts:
	application/config/database.php