Коммит
Merge branch 'master' of https://github.com/IrishMan1921/hockey-cocos2dx

Conflicts:

proj.ios_mac/hockey.xcodeproj/project.xcworkspace/xcshareddata/hockey.xc
checkout
refactor