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

Conflicts:
	ctrip-mobile/Const.h
	ctrip-mobile/Utility.m
	ctrip-mobile/ctrip-mobile/MItemListController.m
fix the "more" bug in from "config view"