'20140923笔记'
Merge branch 'master' of https://github.com/q100036q/Restart_cocos2d