Ran pod install
Merge branch 'master' of https://github.com/opfo/app
Ran bundle install
Merge branch 'master' of https://github.com/opfo/app
Merge branch 'master' of https://github.com/opfo/app
Merge branch 'master' of https://github.com/opfo/app
Merge branch 'master' of https://github.com/opfo/app
Add a commented out spec for json conversion
Tidy up update queries
Merge branch 'master' of https://github.com/opfo/app

Conflicts:
	Code Stream/OPFUpdateQuery.m