Test merge

...
Merge remote-tracking branch 'origin/force-layout' into force-layout

Conflicts:
	js/dataRetrieval.js