Car prices now use colour combination based on VATPrice since Price isn't always filled in
Merge branch 'master' of https://github.com/QFrameTK/TME
Split spring service config into separate file so objects.xml can be included in source control normally again