Use real Car{Make,Model} idents f-me/carma#1360
Fix compilation
f-me/carma#1360 fixes
Merge branch 'i1360-cars' of github.com:f-me/carma-models into i1360-cars

Conflicts:
	src/Carma/Model/Service/Rent.hs
aeson 0.7 f-me/carma#1646
Merge branch 'i1360-cars'