just changed PinchandZoom to pinchAndZoom for the sake of following conventions
Semi-implemented dragging. Added some visual feedback in the status menu. Still not fully functional.
Merge remote-tracking branch 'origin/master'

# By Jeremy Kao
# Via Jeremy Kao
* origin/master:
  Changed implementation of scroll and mapped to MacOSX
Merged with Jeremy's commit