a
Merge branch 'master' of https://github.com/refox1/scc

Conflicts:
client/ifox/scene/BattleMapLayer.mm
Merge branch 'master' of https://github.com/refox1/scc