Update instructions for running with Java 7 JRE
Update license contact details for OSGeo
Merge branch 'master' of git://github.com/geoserver/geoserver