fix warning
Merge pull request #2154 from ZappoMan/warningsfix

fix warning
Merge branch 'master' of https://github.com/worklist/hifi into SvoViewer
fixed more warnings