Some simple changes
Settings View Controller
merge
Merge branch 'Kobe'

Conflicts:
	ItemAdvisor/ItemAdvisor.xcodeproj/project.xcworkspace/xcuserdata/hongchengguo.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/theifgun/ItemAdvisor
Merge branch 'master' into Yuxiang

Conflicts:
	ItemAdvisor/ItemAdvisor.xcodeproj/project.pbxproj