Push
Merge branch 'master' of https://github.com/daren511/ThroneWarsServer

Conflicts:
	ControleBD/Controle.cs
Merge branch 'master' of https://github.com/daren511/ThroneWarsServer.git