Modified mechanics
Merge branch 'development' of github.com:alodnal/HexaConquest into development

Conflicts:
	HexaConquest-csharp.sln