Merge pull request #1 from LukeSwart/geoserver-update

Update Geoserver in Dockerfile to 2.6.1
Add stock configuration web.xml file
Merge branch 'master' of https://github.com/kartoza/docker-geoserver