Add command line parameter that accepts SASS variables for conditional builds
Merge branch 'jlintot push origin mastern-JL_CHANGES'