Upgraded to Gradle 2.X