Merge branch 'develop'

Author: jamiepollock

README.md

@@ -19,34 +19,17 @@ Download the package via one of the following:
 
 ### Usage
 
-See [Usage documentation](docs/Usage.md).
-
-## Current Property editors
-
-### Background 
-- [x] Background Repeat
-- [x] Background Position
-- [x] Background Size
-
-### Content Alignment
-- [ ] Text / Content Alignment
-  - [x] Horizontal
-  - [ ] Vertical
-
-### General
-- [ ] General radio check list (with prevalue support)
-- [x] Color Picker
-
+See the [Wiki](../../wiki/)!
 
 ## Bugs & Additions
 
-If you believe there are any property editors missing from the project please [raise an issue](https://github.com/jamiepollock/umbraco-grid-settings/issues/new). 
+If you believe there are any new additions this project can't live without or maybe you found a bug, please [raise an issue](../../issues/new). 
 
-If you have an implementation you'd like to please [submit a pull request](https://github.com/jamiepollock/umbraco-grid-settings/pull/new/).
+If you have an implementation you'd like to add, please [submit a pull request](../../pull/new/).
 
 ## Licensing
 
-Licensed under the [MIT License](https://github.com/jamiepollock/umbraco-grid-settings/blob/master/LICENSE.md).
+Licensed under the [MIT License](LICENSE.md).
 
 ### Package Logo
 

appveyor.yml

@@ -14,7 +14,6 @@ branches:
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
 init:
-  - set UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta 
 
 test:
   assemblies:

build-appveyor.cmd

@@ -4,4 +4,4 @@ ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
 ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
 
 CALL build\tools\NuGet.exe restore src\Our.Umbraco.GridSettings.sln
-CALL "%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe" build\build.proj
+CALL "%programfiles(x86)%\MSBuild\14.0\Bin\MsBuild.exe" build\package.proj

build/assets/icon/umbraco-gridsettings-128.png renamed to build/assets/icon/128x128.png

@@ -21,7 +21,7 @@
     <Readme>A backoffice plugin to add additional property editors for Umbraco Grid row &amp; column settings</Readme>
     <AuthorName>Jamie Pollock</AuthorName>
     <AuthorUrl>https://github.com/jamiepollock/Umbraco-Grid-Settings/graphs/contributors</AuthorUrl>
-    <IconUrl>https://raw.githubusercontent.com/jamiepollock/Umbraco-Grid-Settings/master/build/assets/icon/umbraco-gridsettings-128.png</IconUrl>
+    <IconUrl>https://raw.githubusercontent.com/jamiepollock/Umbraco-Grid-Settings/master/build/assets/icon/128x128.png</IconUrl>
     <PackageLicenseName>MIT license</PackageLicenseName>
 		<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
     <ProjectUrl>https://github.com/jamiepollock/Umbraco-Grid-Settings</ProjectUrl>
@@ -129,7 +129,7 @@
       <AppPluginFiles Include="$(WebProjectDir)\App_Plugins\Our.Umbraco.GridSettings\**\*.*" />
 
       <!-- Umbraco specific -->
-      <UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\icon\umbraco-GridSettings-32.png"/>
+      <UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\icon\32x32.png"/>
       <PackageFile Include="$(MSBuildProjectDirectory)\package.xml" />
 
       <!-- NuGet specific -->