Squashed 'app/assets/stylesheets/primary/' changes from 7d4edab..183b71a

183b71a Migrate colors to primary

git-subtree-dir: app/assets/stylesheets/primary
git-subtree-split: 183b71a101bb02b606e8dfd7b04b05a3471ff737
Fix merge in colors file