prod pull
new pull

Merge branch 'master' of github.com:colatris/colatris-ios-sdk

Conflicts:
	Colatris.framework/Versions/A/Colatris
	Colatris.framework/Versions/A/Headers/Colatris.h
	colatris-build