Merge branch 'hotfix/bug_fix'
Added dragging to zoom in/out.
Merge branch 'hotfix/fix_bugs' into develop