reduce useless convert
Merge pull request #2 from cocos2d/develop

update
Merge pull request #3 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #4 from cocos2d/develop

sync original repo
Merge pull request #5 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
fix crash related to not support the z length modifier for size_t on vs
Merge pull request #4497 from zhiqiangxu/develop

closed #3559: Useless conversion in ScrollView::onTouchBegan
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
update exception catch clause
Merge pull request #6 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #4759 from Dhilan007/develop_crash

fix crash related to not support the z length modifier for size_t on vs
change interface
[Win32] Update project files.
- lIbGUI
Merge pull request #4776 from pyrasis/develop

[Win32] Update project files.
Develop branch adds lua trigger for CocoStudio