添加了AlertView
添加计数
&&整理目录结构
&&CATextField 功能完善
no message
Merge branch 'branch_Liyuanfeng' into develop

Conflicts:
	cocos2dx/images/CAImage.cpp
	cocos2dx/images/CAImage.h
	cocos2dx/images/CAImageCache.cpp
	cocos2dx/images/CAImageCache.h
	cocos2dx/include/ccTypes.h
	cocos2dx/label_nodes/CALabel.cpp
	cocos2dx/label_nodes/CALabel.h
	cocos2dx/label_nodes/CCLabelTTF.cpp
	cocos2dx/label_nodes/CCLabelTTF.h
	cocos2dx/sprite_nodes/CAImageView.cpp
	cocos2dx/sprite_nodes/CAScale9ImageView.cpp
	cocos2dx/sprite_nodes/CAScale9ImageView.h
	cocos2dx/sprite_nodes/CAView.cpp
	cocos2dx/sprite_nodes/CAView.h
	cocos2dx/text_input_node/CATextField.cpp
	cocos2dx/text_input_node/CATextField.h
	cocos2dx/ui_controller/CABar.cpp
	cocos2dx/ui_controller/CAButton.cpp
	cocos2dx/ui_controller/CAProgress.cpp
	cocos2dx/ui_controller/CAProgress.h
	cocos2dx/ui_controller/CAScrollView.cpp
	cocos2dx/ui_controller/CASegmentedControl.cpp
	cocos2dx/ui_controller/CASlider.cpp
	cocos2dx/ui_controller/CASlider.h
	cocos2dx/ui_controller/CASwitch.cpp
	cocos2dx/ui_controller/CASwitch.h
	cocos2dx/ui_controller/CATableView.cpp
	cocos2dx/ui_controller/CATableView.h
	cocos2dx/ui_controller/CAViewController.cpp
	cocos2dx/ui_controller/CAViewController.h
	extensions/network/HttpRequest.h
	samples/demo/Resources/source_material/GreyDots.png
	samples/demo/Resources/source_material/WhiteDots.png
	samples/demo/Resources/source_material/btn_rounded3D_disabled.png
	samples/demo/Resources/source_material/btn_rounded3D_highlighted.png
	samples/demo/Resources/source_material/btn_rounded3D_normal.png
	samples/demo/Resources/source_material/btn_rounded3D_selected.png
	samples/demo/proj.win32/HelloCpp.vcxproj.filters
	samples/demo/proj.win32/main.cpp
	samples/demo/proj.win32/main.h
	samples/multi-platform-cpp/Classes/AppDelegate.cpp
	samples/multi-platform-cpp/Classes/FirstViewController.cpp
	samples/multi-platform-cpp/Classes/RootViewController.cpp
	samples/multi-platform-cpp/Classes/SecondViewController.cpp
	samples/multi-platform-cpp/Resources/GreyDots.png
	samples/multi-platform-cpp/Resources/WhiteDots.png
	samples/multi-platform-cpp/Resources/bg.jpg
	samples/multi-platform-cpp/Resources/btn_rounded3D_disabled.png
	samples/multi-platform-cpp/Resources/btn_rounded3D_highlighted.png
	samples/multi-platform-cpp/Resources/btn_rounded3D_normal.png
	samples/multi-platform-cpp/Resources/btn_rounded3D_selected.png
	samples/multi-platform-cpp/Resources/fifth_1.png
	samples/multi-platform-cpp/Resources/fifth_2.png
	samples/multi-platform-cpp/Resources/first_1.png
	samples/multi-platform-cpp/Resources/first_2.png
	samples/multi-platform-cpp/Resources/fourth_1.png
	samples/multi-platform-cpp/Resources/fourth_2.png
	samples/multi-platform-cpp/Resources/second_1.png
	samples/multi-platform-cpp/Resources/second_2.png
	samples/multi-platform-cpp/Resources/source_material/GreyDots.png
	samples/multi-platform-cpp/Resources/source_material/WhiteDots.png
	samples/multi-platform-cpp/Resources/source_material/btn_rounded3D_disabled.png
	samples/multi-platform-cpp/Resources/source_material/btn_rounded3D_highlighted.png
	samples/multi-platform-cpp/Resources/source_material/btn_rounded3D_normal.png
	samples/multi-platform-cpp/Resources/source_material/btn_rounded3D_selected.png
	samples/multi-platform-cpp/Resources/third_1.png
	samples/multi-platform-cpp/Resources/third_2.png
	samples/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj
	samples/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj
	samples/multi-platform-cpp/proj.win32.zip
	samples/multi-platform-cpp/proj.win32/HelloCpp.vcxproj.filters
	samples/multi-platform-cpp/proj.win32/main.cpp
	samples/multi-platform-cpp/proj.win32/main.h
	samples/multi-platform-cpp/proj.win32/proj.win32/HelloCpp.sln
	samples/multi-platform-cpp/proj.win32/proj.win32/HelloCpp.vcxproj
	samples/multi-platform-cpp/proj.win32/proj.win32/HelloCpp.vcxproj.filters
	samples/multi-platform-cpp/proj.win32/proj.win32/main.cpp
	samples/multi-platform-cpp/proj.win32/proj.win32/main.h
	template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.xcworkspace/xcuserdata/liynfg.xcuserdatad/UserInterfaceState.xcuserstate
	template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj
	template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.xcworkspace/xcuserdata/liynfg.xcuserdatad/UserInterfaceState.xcuserstate
Merge commit '9866d80f9f38947899adefb107d74cd01d297b56' into branch_Liyuanfeng

Conflicts:
	CocosDenshion/proj.win32/Debug.win32/CocosDenshion.log
	cocos2dx/include/cocos2d.h
	cocos2dx/proj.win32/Debug.win32/cocos2d.log
	cocos2dx/proj.win32/cocos2d.vcxproj
	cocos2dx/proj.win32/cocos2d.vcxproj.filters
	extensions/proj.win32/Debug.win32/libExtensions.log
	samples/multi-platform-cpp/proj.win32/HelloCpp.vcxproj
no message
####CrossApp beta 0.2.0（重要更新） 更新内容：

#####1.整理引擎目录结构
整理目录结构，改名部分类名。

#####2.触摸事件分发优化
触摸事件分发 现在针对滑动容器优化

#####3.添加控件CAAlertView
提示框，按钮个数三个以内横排，超过三个纵向排列，并放入滑动容器中。

#####4.优化CALabel

#####5.补全CATextField功能

#####6.修复部分bug