Improve Gradle build
New release version
Merge
Fixed Gradle(w) build and Travis errors
merge upstream, fix conflict