Merge branch 'adaptions' of github.com:AKSW/fuseki-mods into adaptions

# Conflicts:
#	jena-fmod-admin/src/main/java/org/apache/jena/fuseki/mod/admin/FMod_Admin.java
#	jena-fmod-geosparql/pom.xml
#	jena-fmod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/SpatialIndexComputeService.java
#	jena-fmod-shiro/pom.xml
#	pom.xml