Upgraded to Gradle 2.0