Touch device working
Pinch zoom
Merged the conflicts