Fixed bug of ScrollView
Merge branch 'master' into master_nutty_modify_framework_for315
Update the UIWidget.pkg according to the .h file and the related binding codes
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature
Update pkg file and some project setting
Merge pull request #5733 from samuele3hu/master_armature

Update the UIWidget.pkg according to the .h file and the related binding codes
Merge branch 'master' into master_nutty_modify_framework_for315
initialize m_fSecondsPerframe
Merge pull request #5740 from nutty898/master_nutty_modify_framework_for315

Master nutty modify framework for315
update changelog
change version
[AUTO] : updating submodule reference to latest autogenerated bindings
update changelog
Merge pull request #5746 from CocosRobot/updategeneratedsubmodule_1394679194

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5745 from minggo/master-release

Master release
Update UIWidget.pkg and the related binding codes
Merge branch 'master_armature' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature
Merge pull request #5747 from samuele3hu/master_armature

Update UIWidget.pkg and the related binding codes
Remove `Werror` from compile file.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature