db ignore
Merge branch 'master' into tcmgps

Conflicts:
	application/config/database.php