Dataspace: Updated paths.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webapp/Connector/src/controller/FilterStatus.js
Dataspace: Update plotting to d3.