issue#3630:Adjust some method for more easily create and change type.
update lua binding configuration for label.
1.update lua binding configuration for label.
2.recover old method[createWithTTF]
Fix for compiling error for windows
Bug fixes for new label
convert tab to space
- fix long string will be cut off by function “cc_utf8_to_utf16” ( “cc_utf8_strlen” returns long )
issue #3401: add lua physics slide test, add more banding code, and fix some bugs.
refactor PhysicsContact inherits from EventCustom; simplify emitting collision events
fix compile error
remove the workaround cast
issue #3640: add performance test->renderer LargeTileMap test
closed #3640: change windows project files
Merge pull request #1 from cocos2d/develop

update cc2dx/develop
add check data valid in getStringFromFile

so far no check would be crashed when getData faild.
maybe return an empty string is better.
issue #3401: add physics action and pump test for lua.
closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Relieve inherit from LabelProtocol
closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.