modiry     document->Parse((char*)pByte);  to     document->Parse((const char*)pByte);
Merge branch 'v3' of https://github.com/aeonmine/cocos2d-x into v3

Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp