Merge branch 'hotfix/code-style'
Merge branch 'develop'
Hamcrest was removed a while back, and shouldn't be mentioned in the read me.
Merge branch 'hotfix/readme' into develop
[ci skip]