afsds
Merge branch 'master' of https://github.com/xtank/client

Conflicts:
	XTankApp/bin/XTankApp.swc
	XTankCore/bin/XTankCore.swc
	XTankPublish/dlls/XTankUI.swf
	XTankPublish/modules/BattleModule.swf
	XTankPublish/modules/RoomCreateModule.swf
	XTankPublish/modules/RoomModule.swf
	XTankTools/XTankBarrierEditor/bin-debug/XTankBarrierEditor.swf
	XTankTools/XTankMapEditor/bin-debug/XTankMapEditor.swf
	XTankTools/XTankMapPreView/bin-debug/XTankMapPreView.swf