Merge branch 'master' into CrowIDE

diff --cc Templates/ColorPicker.template
index e128ff718774eaae47545bb82252b16cf33cbb1f,4c1e1280452544f0554449f491b41ef5e5940b97..dbc34851832f8498c768b6757c6a18139801e7b4
--- 1/Templates/ColorPicker.template
--- 2/Templates/ColorPicker.template
+++ b/Templates/ColorPicker.template
@@@ -46,4 -46,4 +46,4 @@@
                                </HorizontalStack>
                        </VerticalStack>
                </HorizontalStack>
--</Border>
++</Border>

diff --cc Tests/Tests.csproj
index ea03ce1a3459b57010f749d1ede118e23661a5a0,a95a034a60c92b8d77cc7ef2be9f1cb1af679bb6..7fd48e3642229821cd39cf303fbe0f816e9a4eae
--- 1/Tests/Tests.csproj
--- 2/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@@ -46,7 -45,7 +45,8 @@@
        <Reference Include="gio-sharp"/>
        <Reference Include="glib-sharp"/>
      <Reference Include="OpenTK">
-       <HintPath>$(SolutionDir)packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath>
+       <HintPath>$(SolutionDir)packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
++      <Package>opentk</Package>
      </Reference>
    </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --cc src/GraphicObjects/TemplatedGroup.cs
Simple merge