Added tip to speed up Gradle locally
Added tip to speed up Gradle in the CI server
Diff/merge tool recommendation