fix test names
Fixed rest of merge conflict in FileAssert license

Hi, while randomly browsing through the source code I noticed that there are remainders of a merge conflict in the license of said file. I've taken the liberty to fix this, the header now looks like on other files in the same directory.
Improve AbstractIterableAssert javadoc
Fixes #299 Refactored failBecauseExceptionWasNotThrown to shouldHaveThrown
Fix badly written test
Merge remote-tracking branch 'origin/master' into java-8