remove conf/database.php
remove index.html
Merge branch 'cht.local' into cht