All this code, and I'm not done
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Code/UsedCarApplication/UsedCarApplication.sln
Merge branch 'develop' of https://github.com/blaavogn/bdsa into develop