add icon
add icon
Merge branch 'master' of https://github.com/caoguangyao/ctrip-mobile

Conflicts:
	.DS_Store
	ctrip-mobile/.DS_Store
	ctrip-mobile/ctrip-mobile.xcodeproj/project.pbxproj