database.php goes back to github
Merge remote-tracking branch 'origin/master'

Conflicts:
	codeigniter/api/config/database.php