Merge remote-tracking branch 'chukong/master'

Conflicts:
framework/cc/uiloader/CCSUILoader.lua