adds support for assertj 1.7.0 (1.6.0 support remained)

So many changes because I don't want to throw strange exceptions in projects
that use assertj 1.6.0 and 1.0.1 fer. This will support 1.7.0 and 1.6.0
assertj together. (Relates to assertj #220 issue)

Closes #11