Merge branch 'develop'

Author: jamiepollock

README.md

@@ -15,7 +15,7 @@ Download the package via one of the following:
 - Our Umbraco [![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/backoffice-extensions/grid-settings/)
 - Appveyor [![Appveyor Build](https://ci.appveyor.com/api/projects/status/wna1x7t9rveb876w?svg=true)](https://ci.appveyor.com/project/jamiepollock/umbraco-grid-settings/build/artifacts)
 
-**Note:** Version 0.2.0+ will only be compatible with Umbraco v7.5.4.
+**Note:** Version 0.2.0+ will only be compatible with Umbraco v7.5.4 minimum.
 
 ### Usage
 

appveyor.yml

@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # Version format
-version: 0.2.0.{build}
+version: 0.2.1.{build}
 
 cache:
   - src\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified

src/Our.Umbraco.GridSettings.Web/Our.Umbraco.GridSettings.Web.csproj

@@ -68,6 +68,8 @@
     <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\BackgroundRepeat\view.html" />
     <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\BackgroundSize\controller.js" />
     <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\BackgroundSize\view.html" />
+    <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\ClassColorPicker\controller.js" />
+    <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\ClassColorPicker\view.html" />
     <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\ColorPicker\controller.js" />
     <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\ColorPicker\view.html" />
     <Content Include="App_Plugins\Our.Umbraco.GridSettings\editors\TextAlign\controller.js" />