Final touches.
Merge branch 'master' of https://github.com/marcjansen/fossgis2014 into gh-pages