database.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/config/database.php