Adding libwebsockets license in WebSocket.h/.cpp.
Log error instead of triggering an assert for shadow and stroke.
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp.
Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite.
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
Removing CODE_SIGN_IDETITY section in prom.pbxproj.

Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
Merge pull request #2785 from dumganhar/develop

Sync some fixes from master branch