commitd
Merge branch 'master' of https://github.com/ICETechnologiesInc/Kikr

Conflicts:
	Kikr.xcworkspace/xcshareddata/Kikr.xccheckout