Fixed Deserialization bug in ZestJSON

Conflicts:
	src/org/mozilla/zest/core/v1/ZestConditional.java
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
Fixed Deserialization bug in ZestJSON

Conflicts:
	src/org/mozilla/zest/core/v1/ZestConditional.java
Fixed Deserialization bug in ZestJSON merge branch

Conflicts:
	src/org/mozilla/zest/core/v1/ZestConditional.java
removed unuseful tests on the branch
Modified std return values, brackets, ZestExpressionURL.deepCopy &
Mozilla license in unit test classes

Conflicts:
	src/org/mozilla/zest/core/v1/ZestExpressionAnd.java
merge with Fixed Deserialization bug in ZestJSON

Conflicts:
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
merge of ZestStructuredExpression

Conflicts:
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
solved conflicts in ZestStructuredExpression.java

Conflicts:
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
fixed conflicts ZestStructuredExpression.java

Conflicts:
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
fixed conflicts in ZestStructuredExpression.java

Conflicts:
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
merged All current tests passed

Conflicts:
	test/org/mozilla/zest/core/v1/TestPrint.java
	test/org/mozilla/zest/core/v1/ZestAllTestSuite.java
	test/org/mozilla/zest/core/v1/ZestAssertBodyRegexUnitTest.java
Added ZestConditionalRegexUnitTest.java & fixed conflicts

Conflicts:
	test/org/mozilla/zest/core/v1/TestPrint.java
	test/org/mozilla/zest/core/v1/ZestAllTestSuite.java
	test/org/mozilla/zest/core/v1/ZestAssertBodyRegexUnitTest.java
	test/org/mozilla/zest/core/v1/ZestExpressionAndUnitTest.java
Merge pull request #35 from seccoale/branch

Fixed Deserialization Bug and reintroduced the missing test
Cant initialise ZestExpressionRegex with a null location - it throws an
exception
Minor tweaks
Merge remote-tracking branch 'upstream/master' & removed unuseful test
of Regex Expression with null params.

Conflicts:
	src/org/mozilla/zest/core/v1/ZestJSON.java
	src/org/mozilla/zest/core/v1/ZestStructuredExpression.java
	test/org/mozilla/zest/core/v1/ZestAllTestSuite.java
	test/org/mozilla/zest/core/v1/ZestConditionalRegexUnitTest.java