Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error
Merge pull request #654 from artbristol/master

Update JUnit version