Generics in JsonMatchers fixed

Conflicts:
	json-unit-fluent/src/test/java/net/javacrumbs/jsonunit/fluent/JsonAssertTest.java
	json-unit-fluent/src/test/java/net/javacrumbs/jsonunit/fluent/JsonFluentAssertTest.java