change
Merge branch 'master' of https://github.com/likunpeng/cocos into studybranch

.
study mainmenu
Merge branch 'studybranch'