adapting boxfloor
Merge branch 'master' of https://github.com/mrbichel/StereoPlanes

Conflicts:
	bin/data/GUI/guiSettings.xml