IS: Cancel resets the sensor selection to its default
Merge branch 'master' into inquiry-space

Conflicts:
	src/experiments/inquiry-space-importer/js/app.js
	src/experiments/inquiry-space-importer/js/sensor.js