Rebased zoom branch on top of dmarcos/bug958200+settings
Fixed jshint issues.