Attempt to fix the conflict.

Conflicts:
	Src/OpenCBS.GUI/LotrasmicMainWindowForm.Designer.cs
	Src/OpenCBS.GUI/LotrasmicMainWindowForm.resx