Adds almost functional pinch zoom
Merge branch 'master' into firefox