choose_mode completed in platform
correct sio
correct clientai.cpp
net_battle mode
Merge branch 'master' of https://github.com/woinck/DS15-dev
Display interface
fix a bug in func.cpp
Merge branch 'master' into server_debugging

Conflicts:
	PlayerFiles/clientai.cpp
	log.log
	sio.py
	sserver.py
3d replayer added