Merge branch 'master' of github.com:worklist/hifi into assignment
add default and QtTraceMsg to switch to avoid warnings
Merge branch 'master' of github.com:worklist/hifi into assignment
Merge pull request #1162 from birarda/assignment

fix for some new warnings in qt 5.2