Disabled warper while we are not using it.
Merge branch 'master' of github.com:mrbichel/StereoPlanes

* 'master' of github.com:mrbichel/StereoPlanes:
  fixed light conflicts in box floor
  added changes to boxFloor
  Bullet has a square named dancer

Conflicts:
	src/testApp.cpp