merge
Merge branch 'master' of https://github.com/Whitebeard86/Gibbo2D

Conflicts:
	Gibbo.Editor.Model/obj/Release/Gibbo.Editor.Model.csproj.GenerateResource.Cache
	Gibbo.Editor.WPF/bin/Release/Gibbo.Editor.WPF.application
	Gibbo.Editor.WPF/bin/Release/Gibbo.Editor.WPF.exe
	Gibbo.Editor.WPF/bin/Release/Gibbo.Editor.WPF.exe.manifest
	Gibbo.Editor.WPF/bin/Release/Gibbo.Editor.WPF.pdb
	Gibbo.Editor.WPF/bin/Release/Gibbo.Editor.WPF.vshost.application
	Gibbo.Editor.WPF/bin/Release/Gibbo.Editor.WPF.vshost.exe.manifest
	Gibbo.Editor.WPF/obj/Release/Gibbo.Editor.WPF.application
	Gibbo.Editor.WPF/obj/Release/Gibbo.Editor.WPF.csproj.GenerateResource.Cache
	Gibbo.Editor.WPF/obj/Release/Gibbo.Editor.WPF.csprojResolveAssemblyReference.cache
	Gibbo.Editor.WPF/obj/Release/Gibbo.Editor.WPF.exe
	Gibbo.Editor.WPF/obj/Release/Gibbo.Editor.WPF.exe.manifest
	Gibbo.Editor.WPF/obj/Release/Gibbo.Editor.WPF.pdb