213
Merge branch 'master' of github.com:edwardean/my

Conflicts:
	AD.xcodeproj/project.pbxproj
	AD.xcodeproj/project.xcworkspace/xcuserdata/lihang.xcuserdatad/UserInterfaceState.xcuserstate
	AD.xcodeproj/xcuserdata/lihang.xcuserdatad/xcschemes/AD.xcscheme
	AD/AppDelegate.h
	AD/StoreDetailViewController.m
	AD/StoreSearchViewController.m
	AD/ViewController.m