Require higher Windshaft to fix handling of CartoCSS layer name
Require latest windshaft to fix confusion between colors and layer names
Merge branch 'release/staging' into develop