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
editVoxels reformat
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool
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
Restored scale copy
Rescale import when using keys +/-
Fixed Jenkins failure
Merge pull request #2697 from Atlante45/placement_tool

Placement tool + other editVoxels features