am ba2adddb: am 3fd7d3d3: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"

* commit 'ba2adddbd998b30fd54888e7d79ad6beae5b5fe2':
  cleaned code, added pinch gesture detector, better opengl context handling, fixed issues