added scale to settings
Merge branch 'master' of http://github.com/worklist/hifi into scale_in_settings
Merge pull request #684 from Atlante45/scale_in_settings

Scale in settings