UPDATE cpp
Test_Battle fineshed, a few bugs
Merge branch 'master' into server_debugging

Conflicts:
	PlayerFiles/ai.cpp
	PlayerFiles/clientai.cpp