Merge branch 'develop'
Merge branch 'develop'
Change AssertJ version
Change equals methods