Replace hamcrest with assertj, annotate and clean up

Uses assertj for tests and improves the formatting of the code.
Adds Feature inventory annotation.
Merge pull request #509 from zanata/assertj-editor-tests

Replace hamcrest with assertj, annotate and clean up