ModelUploader update
Merge branch 'master' of https://github.com/highfidelity/hifi
Fixed JSON parsing
Merge pull request #2698 from Atlante45/master

ModelUploader update to handle new behaviour