Merge branch 'master' of github.com:icanzilb/JSONModel

Conflicts:
	JSONModel.podspec
	JSONModel/JSONModel/JSONModel+CoreData.m
	JSONModel/JSONModelTransformations/JSONValueTransformer.m
	JSONModelDemos.xcworkspace/xcshareddata/JSONModelDemos.xccheckout