update DemoFishingJoy project setting for iOS & mac
update DemoGameScene project setting for iOS & mac
update SampleSceneEditor  project setting for iOS & mac
update SampleFlashImport  project setting for  mac
SmapleChangeEquip update depends cocos2d-x'master branch
SampleFlashImport SampleFrameAnimation update depends cocos2d-x'master branch
SampleKeyFrameAnimation update depends cocos2d-x'master branch
update submodule cocos2d-x
Revert "SampleKeyFrameAnimation update depends cocos2d-x'master branch"

This reverts commit 37cb3e7f0bdb4ab78bf125b36d86908c58560032.
Revert "Revert "SampleKeyFrameAnimation update depends cocos2d-x'master branch""

This reverts commit bb128cdce88530bf47fe6dc40bfdb6430cc54464.
remove useless code for android
update .gitignore
DemoCowboyGame  update depends cocos2d-x'master branch
update file export by CocoStudio 1.2.0.1
update file export by CocoStudio 1.2.0.1
update .gitignore
update file export by CocoStudio 1.2.0.1
Merge branch 'master' of github.com:geron-cn/CocoStudioSamples
animation relatives android   update depends cocos2d-x'master branch 2.2.2
Merge pull request #43 from geron-cn/master

update samples depends cocos2d-x'master branch 2.2.2