combined the dialogfragments into one
v2
Merge branch 'test123' into dev

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