track workspace changes; don't track "sdk/build"
Merge branch 'master' of github.com:BlueKai/bluekai-ios-sdk

Conflicts:
	.gitignore
	sdk/Bluekai_SDK.xcodeproj/xcuserdata/shun.xcuserdatad/xcschemes/BlueKai.xcscheme
Merge branch 'master' of github.com:BlueKai/bluekai-ios-sdk

Conflicts:
	.gitignore
	sdk/Bluekai_SDK.xcodeproj/xcuserdata/shun.xcuserdatad/xcschemes/BlueKai.xcscheme