upgrade to Rhino 1.7R4
fix due to upgrade to Jython 2.1
fixed doc generation
Merge branch 'master' into gradle-build
replaced ant with gradle
Merge branch 'master' into deploy
commited plugin build 30580
Merge branch 'deploy' of github.com:Gubaer/josm-scripting-plugin into deploy

Conflicts:
	dist/scripting.jar
commited plugin build 30580