merge with upstream
Merge branch 'master' of https://github.com/RichmondDay/www.mini.ca
just testing a couple of french things

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

Hide 3rd opt-in
Merge branch 'master' of https://github.com/RichmondDay/www.mini.ca
Merge pull request #141 from jonezy/master

just testing a couple of french things
Merge branch 'master' of https://github.com/RichmondDay/www.mini.ca
Working on highlights
completed coupe
clubman completed
roadster complete
roadster complete
added paceman - countryman - convertable
not 100% done but asked to push
added countryman dir to paceman so there would be some images
updated r58 xml
Merge pull request #142 from shutter111/master

Highlights