append changes for bintray
correct version
allow local modifications for release plugin due to
https://github.com/ari/gradle-release-plugin/issues/19
Merge branch 'master' into java7

Conflicts:
	.travis.yml
	gradle.properties