super626/cocos2d-x — pull request #194 by lvlonggame (2014-12-26 05:45:13+00:00)
Title: merge cocos2d-x

resolve conflict.