数据库配置

Signed-off-by: shaoqi <shaoqisq123@gmail.com>
Merge branch 'master' of https://github.com/RongERong/sitecode

Conflicts:
	fuel/app/modules/Manage/classes/controller/common.php
	fuel/app/modules/manage/classes/controller/common.php

Signed-off-by: shaoqi <shaoqisq123@gmail.com>