Changes made before repo restructure.
Merge branch 'master' of https://github.com/craftworkgames/CraftworkGames.Gui

Conflicts:
	CraftworkGames.Gui.csproj