update several changes
Merge branch 'master' of git://github.com/GeoKnow/geoknow.eu