cleanup names and fix some warnings
Merge branch 'master' of https://github.com/worklist/hifi into SvoViewer
fixed more warnings
one more attempt to get this to work
Merge branch 'master' of https://github.com/worklist/hifi into SvoViewer
remove use of getTrueColor() which is going away
Merge pull request #2153 from ZappoMan/SvoViewer

cleanup names and fix some warnings
Merge branch 'master' of https://github.com/worklist/hifi into cruft_removal