Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Improved dealer UI and calculations
Merge remote-tracking branch 'origin/gh-pages'