Remove sass cache
Remove theme-settings.php file as is not in use
Merge branch 'master' into test
Merge branch 'test' into prod