Gradle updates
Further fixes for AndroidStudio beta
Merge branch 'feature/gradle-updates' into develop