Colors finito
Merge branch 'dbfinalz' into dev

Conflicts:
	source/Cars/src/dk/aau/cs/giraf/cars/SettingsActivity.java