nothing
Merge branch 'debugging' of https://github.com/woinck/DS15-dev into debugging
Merge branch 'debugging' into server_debugging

Conflicts:
	Uihumanvsai.py
	lib/human/info_widget.py
	new_map.map
	old_map.map
nothing
fix a lot of bugs,there're still more
Merge branch 'debugging' of https://github.com/woinck/DS15-dev into debugging
Merge branch 'debugging' into server_debugging

Conflicts:
	Uihumanvsai.py
	lib/human/info_widget.py
	old_map.map
tried to fix the return button bug but failed
new_pictures
Merge remote-tracking branch 'origin/server_debugging' into debugging
something for exe
add turret
Merge remote-tracking branch 'origin/server_debugging' into debugging
炮塔有点问题，背景问题