wiremesh final controls
.
Merge branch 'master' of https://github.com/mrbichel/StereoPlanes

Conflicts:
	src/AttractorControl.cpp
	src/AttractorControl.h
	src/BoxFloor.cpp