Further fixes after upgrading to Gradle 4 / Android Studio 3
Further fixes after upgrading to Gradle 4 / Android Studio 3

inaturalist/iNaturalistAndroid,inaturalist/iNaturalistAndroid,inaturalist/iNaturalistAndroid,inaturalist/iNaturalistAndroid