merge main development branch
refactored conflict logic
Merge pull request #439 from tonyrd/development

URGENT FIX. [Retailer Site] Book A Test Drive keeps asking for Retailer when
live copy of the db

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #440 from jonezy/development

Feb 27 updates
F56 Build and Price, ready for review
Updated Wheel Event
Updated Interior Click Event
Merge pull request #442 from jonezy/development

live copy of the db
Merge pull request #441 from shutter111/development

F56 Build and Price, ready for review
merge main development branch
refactored conflict logic
F56 Build and Price, ready for review
Updated Wheel Event
Updated Interior Click Event
Merge pull request #443 from jonezy/development

synching with master
updated vehicle gallery images

Signed-off-by: Chris Jones <chris@jonezy.org>
removed stray semicolon in ie9

Signed-off-by: Chris Jones <chris@jonezy.org>
financial services single payment lease readmore link visibility

- the read more link under the single payment lease area is now aligned
  right so that it isn't hidden when expanded.

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #444 from jonezy/development

starting march 5 updates