Removed console log
updated config conflict message
Merge pull request #806 from shutter111/development

F56 Build and Price Conflict class
Merge branch 'development' of https://github.com/RichmondDay/www.mini.ca into extended-warranty-calculator
Service calulator updates