Adding CCControl js binding.
ControlEvent --> Control::EventType.
make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
update s3tc#1
update s3tc #2
update s3tc #3 ,android test
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
update s3tc #3 ,standard of code
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
Merge pull request #3363 from tiantian20007/localDev

closed 2501: make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
closed #2501: Update AUTHORS [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
nothing with s3tc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3394 from CocosRobot/updategeneratedsubmodule_1375930944

[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'iss1690-cccontorl-js' into iss1690-bind-cccontrol
update s3tc #4 , code standardization
Reverting the changed submodules.
Removing the conflict generated files.