database configure
Merge branch 'master' of https://github.com/guzeng/one

Conflicts:
	app/config/database.php
database configure
untrack app/config/database.php