battle+
Merge branch 'master' of git://github.com/huxiuhan/wmserver
battle ok