fix compile error and synchronizate the UI change for Lua
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Merge pull request #6758 from samuele3hu/v3_fix

fix compile error and synchronizate the UI change for Lua