Database config
Enviroment Vars
Database Vars, bugsnag config
Test
Merge branch 'refs/heads/master' into develop

Conflicts:
	app/config/database.php