Update gradle wrapper. Add JUnit for test compilation.
Merge remote-tracking branch 'upstream/master'