Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues"