fixes
- added button to toggle between 2D & 3D
- updated the tap handling code
Merge remote-tracking branch 'origin/master'