on rentre dans la partie!
Merge branch 'master' of https://github.com/daren511/ThroneWarsServer.git
Merge branch 'master' of https://github.com/daren511/ThroneWarsServer

Conflicts:
	ThroneWars/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll