1、回复以前的版本。
Merge branch 'RefreshResSupportInCocos2dx' of git://github.com/chengstory/cocos2d-x into RefreshResSupportInCocos2dx

Conflicts:
	extensions/CocoStudio/Reader/GUIReader.cpp
	extensions/CocoStudio/Reader/GUIReader.h
	extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.h
	extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.h
	extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.h
	extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.h
	extensions/CocoStudio/Reader/WidgetReader/LabelReader/LabelReader.h
	extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.h
	extensions/CocoStudio/Reader/WidgetReader/ListViewReader/ListViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.h
	extensions/CocoStudio/Reader/WidgetReader/PageViewReader/PageViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/ScrollViewReader/ScrollViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.h
	extensions/CocoStudio/Reader/WidgetReader/TextFieldReader/TextFieldReader.h
	extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h
	extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h
Merge branch 'RefreshResSupportInCocos2dx' of git://github.com/chengstory/cocos2d-x into RefreshResSupportInCocos2dx

Conflicts:
	extensions/CocoStudio/Reader/GUIReader.cpp
	extensions/CocoStudio/Reader/GUIReader.h
	extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.h
	extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.h
	extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.h
	extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.h
	extensions/CocoStudio/Reader/WidgetReader/LabelReader/LabelReader.h
	extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.h
	extensions/CocoStudio/Reader/WidgetReader/ListViewReader/ListViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.h
	extensions/CocoStudio/Reader/WidgetReader/PageViewReader/PageViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/ScrollViewReader/ScrollViewReader.h
	extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.h
	extensions/CocoStudio/Reader/WidgetReader/TextFieldReader/TextFieldReader.h
	extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h
	extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h
Merge branch 'RefreshResSupportInCocos2dx' of git://github.com/chengstory/cocos2d-x into RefreshResSupportInCocos2dx
Merge branch 'RefreshResSupportInCocos2dx' of git://github.com/chengstory/cocos2d-x into RefreshResSupportInCocos2dx

Conflicts:
	extensions/CocoStudio/Reader/GUIReader.cpp
	extensions/CocoStudio/Reader/GUIReader.h
	extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h
	extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h
1. 更新UI。
Merge branch 'RefreshResSupportInCocos2dx' of git://github.com/chengstory/cocos2d-x into RefreshResSupportInCocos2dx

Conflicts:
	extensions/CocoStudio/Reader/GUIReader.cpp
	extensions/CocoStudio/Reader/GUIReader.h
	extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.cpp
	extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h
1.  Update Timeline Animation.
1.  修正编译报错。
Merge branch 'RefreshResSupportInCocos2dx' of git://github.com/chengstory/cocos2d-x into RefreshResSupportInCocos2dx
1. 修正widnows编译不过的问题。
修改工程配置文件,兼容Mac OS各个版本
Merge pull request #44 from xiexin36/RefreshResSupportInCocos2dx_System

修改工程配置文件,兼容Mac OS各个版本
1.  Target and project 都改为OSX 10.8  和  Target 10.7.
Merge pull request #45 from xiexin36/RefreshResSupportInCocos2dx_MSystem

1.  Target and project 都改为OSX 10.8  和  Target 10.7.
add gotoFrameAndPlay and setCurrentFrame interface
Merge pull request #47 from 2youyouo2/RefreshResSupportInCocos2dx

add gotoFrameAndPlay and setCurrentFrame interface
1. update cocos2dx lib.
1. merge v2 version
1、解决 zlib.h 编译不过的问题。