Upgrade to Gradle 1.6

Paving the way for Sonar integration
Integrate Sonar into the build
Merge branch 'sonar'