Update cocoa pods and fix usage of JSON serializer
Merge branch 'develop' into feature/modification-support

Conflicts:
	Podfile.lock