Commit db
Merge branch 'master' of github.com:nguyen-phuoc-mulodo/TimChoi

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