- product stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	SkosShopper/fuseki/log/fuseki-log.log