Merge branch 'develop' into feature/new-packaging

Conflicts:
	Podfile.lock
Merge branch 'feature/new-packaging' of github.com:mindsnacks/Zinc-ObjC into feature/new-packaging