Made changes on dedicated server
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	.gitignore
	Dedicated Server/Bin/x86/C++CLI.dll