Lets have docking stuff
Merge remote-tracking branch 'origin/sinz_sucks_at_merges'

Conflicts:
	WorldSmith/MainForm.Designer.cs
	WorldSmith/MainForm.cs
	WorldSmith/WorldSmith.csproj