.
Merge branch 'master' of https://github.com/TeamWolfRaider/TeamWork

Conflicts:
	WolfRaider/WolfRaider.DataConverter.Tests/WolfRaider.DataConverter.Tests.csproj