Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata
Merge branch 'display_models_metadata' of https://github.com/Atlante45/hifi into display_models_metadata