排除删除database.php配置文件
忽略列表
Merge branch 'develop' of github.com:WangTe/WuJiaDian into develop

Conflicts:
	application/config/database.php