Updates to use latest build tools & plugins
Merge branch 'dev' of github.com:novoda/gertherb into dev

Conflicts:
	app/build.gradle
	build.gradle