Get rid of GestureOverlay
Merge remote-tracking branch 'origin/master'