changes in basic.py
Merge branch 'debugging'
new func
new func

Conflicts:
	setup.py
Merge branch 'master' of https://github.com/woinck/DS15-dev
Merge remote-tracking branch 'origin/master'
solving attack range
Merge branch 'debugging'
logic bug fixed, ai timeout bug fixed
logic&server reverse
Merge branch 'debugging'

Conflicts:
	PlayerFiles/clientai.cpp
	log.log
	sio.py
move_id bug solved
rbInfo sending bug & sclientlogic listrange bug solved
add FREE_CHOOSE mode
map bug fixed
Merge branch 'master' of https://github.com/woinck/DS15-dev
end score,ai files
update choose
update choose
Merge branch 'master' of https://github.com/woinck/DS15-dev

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