Moved database credentials to config
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/core/DB.php