Some QSettings cleanup + persistant script location
Added temp fix to ModelUploader dialog too
Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location
Removed extra line
Merge pull request #2642 from Atlante45/persistant_script_location

Persistant script location