init
Merge branch 'master' of git.dev.sh.ctripcorp.com:jiey/coco-demo

Conflicts:
	.bowerrc
	.jshintrc
	Gruntfile.js
	README.md
	bower.json
	coco/coco-app/css_v2/base.css
	coco/coco-app/css_v2/flight.css
	coco/coco-app/css_v2/hotel.css
	coco/coco-app/css_v2/membercenter.css
	coco/coco-app/images/default_hotellist.jpg
	coco/coco-app/images/flight_logo_x1.png
	coco/coco-app/images/hotel_preview.jpg
	coco/coco-app/images/map_preview.jpg
	coco/coco-app/img_v2/banner_grayBg.png
	coco/coco-app/img_v2/diamstar.png
	coco/coco-app/img_v2/flight_filter.png
	coco/coco-app/img_v2/homeLogo_new.png
	coco/coco-app/img_v2/homeLogo_new_x2.png
	coco/coco-app/img_v2/home_logo.png
	coco/coco-app/img_v2/home_logo_x2.png
	coco/coco-app/img_v2/hotel_filter.png
	coco/coco-app/img_v2/ico_country_x2.png
	coco/coco-app/img_v2/icon_ctrip_gray_loading.png
	coco/coco-app/img_v2/icon_ctrip_gray_loading@2x.png
	coco/coco-app/img_v2/icon_ctrip_loading_gray_logo.png
	coco/coco-app/img_v2/icon_ctrip_loading_gray_logo@2x.png
	coco/coco-app/img_v2/logoBlue.png
	coco/coco-app/img_v2/logoBlue_x2.png
	coco/coco-app/img_v2/m/app_icon_114.png
	coco/coco-app/img_v2/m/app_icon_72.png
	coco/coco-app/img_v2/m/startup.png
	coco/coco-app/img_v2/m/startup_1136_2x.png
	coco/coco-app/img_v2/m/startup_2x.png
	coco/coco-app/img_v2/map.png
	coco/coco-app/img_v2/popup_banner.png
	coco/coco-app/img_v2/popup_banner_x2.png
	coco/coco-app/img_v2/popup_text.png
	coco/coco-app/img_v2/popup_text_x2.png
	coco/coco-app/img_v2/reviews_level.png
	coco/coco-app/img_v2/sign_promot.png
	coco/coco-app/img_v2/sprite_x2.png
	coco/coco-app/img_v2/status_ico.png
	coco/coco-app/img_v2/weather_ico.png
	coco/coco-app/index.html
	coco/coco-app/js/config/config.js
	coco/coco-app/js/main.js
	coco/coco-app/js/views/home/choose-airport-arrive.js
	coco/coco-app/js/views/home/choose-airport-depart.js
	coco/coco-app/js/views/home/choose-city.js
	coco/coco-app/js/views/home/choose-flight-date.js
	coco/coco-app/js/views/home/choose-hotel-name.js
	coco/coco-app/js/views/home/choose-hotel-staying.js
	coco/coco-app/js/views/home/currency.js
	coco/coco-app/js/views/home/flight.js
	coco/coco-app/js/views/home/home.js
	coco/coco-app/js/views/home/hotel.js
	coco/coco-app/js/views/home/language.js
	coco/coco-app/js/views/home/slide-nav.js
	coco/coco-app/slideMenu.html
	coco/libs/common/events/events-v0.1.0.js
	coco/libs/common/extend/extend-v0.1.0.js
	coco/libs/common/geolocation/geolocation-v0.1.0.js
	coco/libs/common/inherit/inherit-v0.1.0.js
	coco/libs/common/keyword-store/keyword-store-v0.1.0.js
	coco/libs/common/local-storage/local-storage-v0.1.0.js
	coco/libs/controller/side-menu-controller/side-menu-controller-v0.1.0.js
	coco/libs/mvc/model/model-v0.1.0.js
	coco/libs/mvc/page-view/page-view-v0.1.0.js
	coco/libs/mvc/view/view-v0.1.0.js
	coco/libs/ui/alert/alert-v0.1.0.js
	coco/libs/ui/calendar/calendar-v0.1.0.js
	coco/libs/ui/loading-layer/loading-layer-v0.1.0.js
	coco/libs/ui/loading/loading-v0.1.0.js
	coco/libs/util/date/date-v0.1.0.js
	coco/libs/util/validate/validate-v0.1.0.js
	coco/libs/utils/activator/activator-v0.1.0.js
	coco/libs/utils/css/css-v0.1.0.js
	coco/libs/utils/date/date-v0.1.0.js
	coco/libs/utils/dom-utils/dom-utils-v0.1.0.js
	coco/libs/utils/events/events-v0.1.0.js
	coco/libs/utils/gestures/gestures-v0.1.0.js
	coco/libs/utils/platform/platform-v0.1.0.js
	coco/libs/utils/tap/tap-v0.1.0.js
	coco/libs/utils/utils/utils-v0.1.0.js
	coco/libs/utils/validate/validate-v0.1.0.js
	coco/libs/utils/viewport/viewport-v0.1.0.js
	coco/libs/views/side-menu-view/side-menu-view-v0.1.0.js
	coco/libs/views/view/view-v0.1.0.js
	config.js
	install.sh
	karma.conf.js
	package.json
	test/coco/common/events/events-Spec.js
	test/coco/my-Spec.js
	test/test-main.js
	test/webdriverio/page-index.js