update to latest server
Merge branch 'master' of https://github.com/RedshirtMB/GameBrowser-Server

Conflicts:
	GameBrowser/GameBrowser.csproj
	GameBrowser/packages.config