Merge branch 'random_sounds' of https://github.com/Atlante45/hifi into placement_tool
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool
Added urlGoTo
Added urlGoTo
Changed goTo's to statics
Update Application.h
editVoxels reformat
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool
Fix format
ModelUploader update
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool
Fix format
Merge pull request #2696 from birarda/master

change Sound property for JS to hasDownloaded, fix geometry crash
Merge pull request #2680 from SydoxX/master

URL scheme to go to location
Some code cleaning
Fixed wire cube overlay not drawn with right line width
Added getter for tree scale in js
Removed Debug
Improved scale selector, changed first swatch behaviours, improved placement tool
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool

Conflicts:
	interface/src/ui/Stats.cpp