Update for dependency changes
Merge branch 'master' of https://github.com/usepropeller/HybridKit-iOS

Conflicts:
	Podfile.lock