test
Merge branch 'master' of github.com:WangTe/duikang

Conflicts:
	application/config/config.php
	database/database.php