Update tests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/JsonMatcher/Matcher.php
	src/JsonMatcher/Matcher/ScalarMatcher.php
	tests/JsonMatcher/ArrayMatcherTest.php