updated version numbers to 2.4
Merge branch 'master' of git://github.com/geoserver/geoserver