Merge branch 'master' into jackson-1.x

Conflicts:
	RELEASENOTES.md
	json-unit-core/pom.xml
	json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/Diff.java
	json-unit-fluent/pom.xml
	json-unit/pom.xml
	json-unit/src/test/java/net/javacrumbs/jsonunit/JsonAssertTest.java
	json-unit/src/test/java/net/javacrumbs/jsonunit/JsonMatchersTest.java
	pom.xml