update ui animation with frame ease type
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
merge from develop branch
resolved ui animation easing error for develop branch
issue #3480
                  1.  add SceneReader Tests.
                  2.  Modify class member name.
issue #3480
            1.  add getNode  and  setNode class function to Component.
            2.  fixes some build error.
issue #3480  upload Samples resources.
fixed #3480  add search paths.
fixed #3480 remove unused ret.
add cocos files list configure script
Fixed bugs of page view
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
fixed #3480
		1.  remove unused getnode and setnode interface.
                 2.  add condition test.
                 3.  Modify ComAttribute to support for parse json file.
                 4.  Replace scenereader callback function  to C++ 11 implement.
Merge branch 'develop' into #3480

Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets
Merge branch 'develop' into #3480
Add "addNode" methods
fixed #3480  loadSceneEdtiorFileTest -> LoadSceneEdtiorFileTest