Some fixes

Changed Java and Tomcat version numbers
Added a chapter on GeoServer data directory
Merge branch 'develop' of https://github.com/nfms4redd/nfms into develop