Settings View Controller
Merge branch 'Kobe'

Conflicts:
	ItemAdvisor/ItemAdvisor.xcodeproj/project.xcworkspace/xcuserdata/hongchengguo.xcuserdatad/UserInterfaceState.xcuserstate