seperate floor and wall cam positions
Merge branch 'master' of https://github.com/mrbichel/StereoPlanes

* 'master' of https://github.com/mrbichel/StereoPlanes:
  Disabled warper while we are not using it.
  fixed light conflicts in box floor
  added changes to boxFloor

Conflicts:
	src/testApp.cpp