JDK 7 issue #231
Merge branch 'osgeo79' of github.com:znmeb/Computational-Journalism-Publishers-Workbench into osgeo79