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