Adds almost functional pinch zoom, take 2
Fixes image directory name
Merge branch 'master' into firefox