Updated gradle version and new android plugin definitions
Fixed issues with sonatype script
Merge branch 'feature/gradle-update' into develop