modify
Merge branch 'master' of https://github.com/hidog/test

Conflicts:
	SQLite_Test/xcode/xcode.xcodeproj/project.xcworkspace/xcuserdata/hidog.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/hidog/test