Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
	src/main/java/org/fest/assertions/api/AbstractAssert.java
	src/main/java/org/fest/assertions/api/AbstractComparableAssert.java
	src/main/java/org/fest/assertions/api/AbstractUnevenComparableAssert.java
	src/main/java/org/fest/assertions/api/ImageAssert.java
	src/main/java/org/fest/assertions/api/ThrowableAssert.java
	src/main/java/org/fest/assertions/error/ShouldBeInTheFuture.java
	src/main/java/org/fest/assertions/error/ShouldBeInThePast.java
	src/main/java/org/fest/assertions/error/ShouldBeToday.java
	src/main/java/org/fest/assertions/internal/Images.java
	src/main/java/org/fest/assertions/internal/Objects.java
	src/main/java/org/fest/assertions/internal/Throwables.java
	src/main/java/org/fest/assertions/util/ImageReader.java
	src/test/java/org/fest/assertions/api/Assertions_assertThat_with_BufferedImage_Test.java
	src/test/java/org/fest/assertions/api/BooleanArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/BooleanArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/BooleanArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/BooleanArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/BooleanArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/ByteArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/ByteArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/ByteArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/ByteArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/ByteArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/CharArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/CharArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/CharArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/CharArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/CharArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/DoubleArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/DoubleArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/DoubleArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/DoubleArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/DoubleArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/FloatArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/FloatArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/FloatArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/FloatArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/FloatArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/ImageAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/ImageAssert_isEqualTo_Test.java
	src/test/java/org/fest/assertions/api/ImageAssert_isEqualTo_WithOffset_Test.java
	src/test/java/org/fest/assertions/api/ImageAssert_isNotEqualTo_Test.java
	src/test/java/org/fest/assertions/api/ImageAssert_usingComparator_Test.java
	src/test/java/org/fest/assertions/api/IntArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/IntArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/IntArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/IntArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/IntArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/LongArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/LongArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/LongArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/LongArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/LongArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/ObjectArrayAssert_hasSameSizeAs_with_Arrays_Test.java
	src/test/java/org/fest/assertions/api/ObjectArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/ObjectArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/ObjectArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/ObjectArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/api/ShortArrayAssert_hasSameSizeAs_with_Array_Test.java
	src/test/java/org/fest/assertions/api/ShortArrayAssert_hasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/api/ShortArrayAssert_hasSize_Test.java
	src/test/java/org/fest/assertions/api/ShortArrayAssert_isEmpty_Test.java
	src/test/java/org/fest/assertions/api/ShortArrayAssert_isNotEmpty_Test.java
	src/test/java/org/fest/assertions/data/Index_atIndex_Test.java
	src/test/java/org/fest/assertions/data/Offset_offset_with_Double_Test.java
	src/test/java/org/fest/assertions/data/Offset_offset_with_Float_Test.java
	src/test/java/org/fest/assertions/data/Offset_offset_with_Integer_Test.java
	src/test/java/org/fest/assertions/data/RgbColor_color_with_single_RGB_Test.java
	src/test/java/org/fest/assertions/data/RgbColor_isEqualTo_Test.java
	src/test/java/org/fest/assertions/groups/Properties_extractProperty_Test.java
	src/test/java/org/fest/assertions/groups/Properties_from_with_Collection_Test.java
	src/test/java/org/fest/assertions/groups/Properties_from_with_array_Test.java
	src/test/java/org/fest/assertions/internal/BooleanArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/BooleanArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/BooleanArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/BooleanArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/BooleanArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/BooleanArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/ByteArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/ByteArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/ByteArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/ByteArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/ByteArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/ByteArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/CharArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/CharArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/CharArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/CharArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/CharArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/CharArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/Conditions_assertDoesNotHave_Test.java
	src/test/java/org/fest/assertions/internal/Conditions_assertHas_Test.java
	src/test/java/org/fest/assertions/internal/Conditions_assertIsNot_Test.java
	src/test/java/org/fest/assertions/internal/Conditions_assertIs_Test.java
	src/test/java/org/fest/assertions/internal/Diff_diff_File_Test.java
	src/test/java/org/fest/assertions/internal/DoubleArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/DoubleArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/DoubleArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/DoubleArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/DoubleArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/DoubleArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertDoesNotExist_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertEqualContent_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertExists_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertIsAbsolute_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertIsDirectory_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertIsFile_Test.java
	src/test/java/org/fest/assertions/internal/Files_assertIsRelative_Test.java
	src/test/java/org/fest/assertions/internal/FloatArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/FloatArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/FloatArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/FloatArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/FloatArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/FloatArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/Images_assertEqual_Test.java
	src/test/java/org/fest/assertions/internal/Images_assertEqual_with_offset_Test.java
	src/test/java/org/fest/assertions/internal/Images_assertHasSize_Test.java
	src/test/java/org/fest/assertions/internal/Images_assertNotEqual_Test.java
	src/test/java/org/fest/assertions/internal/InputStreams_assertEqualContent_Test.java
	src/test/java/org/fest/assertions/internal/IntArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/IntArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/IntArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/IntArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/IntArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/IntArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertContainsAll_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertContainsNull_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertDoesNotContainNull_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertEmpty_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertHasSameSizeAs_with_Iterable_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertHasSize_Test.java
	src/test/java/org/fest/assertions/internal/Iterables_assertNotEmpty_Test.java
	src/test/java/org/fest/assertions/internal/Lists_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/Lists_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/LongArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/LongArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/LongArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/LongArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/LongArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/LongArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertContainsKey_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertContainsValue_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertDoesNotContainKey_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertDoesNotContainValue_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertEmpty_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertHasSize_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertNotEmpty_Test.java
	src/test/java/org/fest/assertions/internal/Maps_assertNullOrEmpty_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertContainsAll_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertContainsNull_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertDoesNotContainNull_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/ObjectArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/internal/PropertySupport_propertyValues_Test.java
	src/test/java/org/fest/assertions/internal/PropertySupport_propertyValues_with_mocks_Test.java
	src/test/java/org/fest/assertions/internal/ShortArrays_assertContainsOnly_Test.java
	src/test/java/org/fest/assertions/internal/ShortArrays_assertContains_Test.java
	src/test/java/org/fest/assertions/internal/ShortArrays_assertDoesNotContain_Test.java
	src/test/java/org/fest/assertions/internal/ShortArrays_assertDoesNotHaveDuplicates_Test.java
	src/test/java/org/fest/assertions/internal/ShortArrays_assertIsSortedAccordingToComparator_Test.java
	src/test/java/org/fest/assertions/internal/ShortArrays_assertIsSorted_Test.java
	src/test/java/org/fest/assertions/test/BooleanArrayFactory.java
	src/test/java/org/fest/assertions/test/ByteArrayFactory.java
	src/test/java/org/fest/assertions/test/CharArrayFactory.java
	src/test/java/org/fest/assertions/test/DoubleArrayFactory.java
	src/test/java/org/fest/assertions/test/Employee.java
	src/test/java/org/fest/assertions/test/ErrorMessages.java
	src/test/java/org/fest/assertions/test/ExpectedException.java
	src/test/java/org/fest/assertions/test/FailureMessages.java
	src/test/java/org/fest/assertions/test/FloatArrayFactory.java
	src/test/java/org/fest/assertions/test/IntArrayFactory.java
	src/test/java/org/fest/assertions/test/Jedi.java
	src/test/java/org/fest/assertions/test/LongArrayFactory.java
	src/test/java/org/fest/assertions/test/MapFactory.java
	src/test/java/org/fest/assertions/test/Name.java
	src/test/java/org/fest/assertions/test/ObjectArrayFactory.java
	src/test/java/org/fest/assertions/test/ParameterSource.java
	src/test/java/org/fest/assertions/test/Person.java
	src/test/java/org/fest/assertions/test/PersonCaseInsensitiveNameComparator.java
	src/test/java/org/fest/assertions/test/Player.java
	src/test/java/org/fest/assertions/test/ShortArrayFactory.java
	src/test/java/org/fest/assertions/test/TestData.java
	src/test/java/org/fest/assertions/test/TestFailures.java
	src/test/java/org/fest/assertions/test/TextFileWriter.java
	src/test/java/org/fest/assertions/test/Types.java
	src/test/java/org/fest/assertions/util/ImageReader_readImageFrom_Test.java