remove warnings under win32
revert vcxproj files
label:support clip blank of upper and lower margin.
add getter of ClipMarginEnabled.
[AUTO]: updating luabinding automatically
closed #4542: fix crash in win32(delete mutex while still lock)
Merge pull request #5961 from CocosRobot/update_lua_bindings_1395735167

[AUTO]: updating luabinding automatically
closed #2880, Generate mipmap for the texture has mipmaps when reload textures.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880
[AUTO][ci skip]: updating cocos2dx_files.json
[ci] Updates travis scripts.
Merge pull request #5963 from dumganhar/develop

[ci] Updates travis scripts. git diff compared with origin/develop
Merge pull request #5962 from CocosRobot/update_cocosfiles_1395735732

[AUTO][ci skip]: updating cocos2dx_files.json
[AUTO]: updating luabinding automatically
Merge pull request #5943 from koowolf/websocket_fix

closed #4542: WebsocketTest crashes on win32, it may delete mutex which is still being locked
Merge pull request #5965 from natural-law/issue2880

Generate mipmap for the texture has mipmaps when reload textures.
Update CHANGELOG [ci skip]
Merge pull request #5964 from CocosRobot/update_lua_bindings_1395735859

[AUTO]: updating luabinding automatically
Update getter of ClipMarginEnabled.
Merge pull request #5931 from Dhilan007/develop_label

label: Support to clip transparent area of Label, content size will be updated with only non-transparent area.