Created Color swatches
remove map
remove maps
Merge branch 'dev'
Resolve conflict with style.scss