Merge branch 'master' of https://github.com/TheCutter/SMProxy

Conflicts:
	SMProxy/Plugins/ReplayPlugin.cs
	SMProxy/Proxy.cs
removed