Cito.
Merge branch 'master' of https://github.com/manicdigger/manicdigger

Conflicts:
	ManicDiggerLib/Client/Game.ci.cs
	ManicDiggerLib/ManicDiggerGameWindow.cs