commit changes before merge with master
commit changes on master compiled css
Merge branch 'configurator-dev'