bug fix and improvements
IE bug fixed
zoomOn button Bug fixed
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into docBranch