Fixed Deserialization bug in ZestJSON merge branch

Conflicts:
	src/org/mozilla/zest/core/v1/ZestConditional.java