Pre-merge
Merge branch 'HEAD' of git@github.com:Vanaheimr/Styx.git

Conflicts:
	Styx/Arrows/SimpleArrows/Map.cs
	Styx/Styx.csproj
Merge