non change
Merge branch 'master' of https://github.com/artmak/manders_v2

Conflicts:
	manders_v2/manders_v2.csproj