Bug do Git
Merge branch 'master' of https://github.com/Mateuus/server

Conflicts:
	src/Scripts/WOBackend-ASP.NET/WOBackend-ASP.NET.suo
	src/WarInc_Server.ncb
	src/WarInc_Server.suo