Update all locations that update settings to call bumpSettings()
Fix bug with chat scrolling randomly
Fix bug with dropping hifi images not working on Windows

URLs on Windows included three forward-slashes, ex `file:///C:...`.
Using `toLocalFile()` correctly stringifies the location.
add color to sphere property editor
more model naming cleanup and fixing example scripts
new example script
flock of butterflies as entities
formatting fixes
Merge pull request #3346 from ZappoMan/virtualEntities

More Entities work
add debug to show that domain connection is being attempted
Merge pull request #3347 from birarda/domain-connect-debug

add debug to show that domain connection is being attempted
patch for possible static memory corruption on large edit entity messages
fix for bad avatar bounding shape on resize
Merge pull request #3349 from AndrewMeadows/inertia

fix for bad avatar bounding shape on resize
Merge pull request #3344 from huffman/19944

Code Review for Job #19944
Merge pull request #3348 from ZappoMan/virtualEntities

patch for possible static memory corruption on large edit entity messages
Merge pull request #3336 from huffman/19995

Code Review for Job #19995
tweaks to butterflies, animation, plus reformatting to match coding standard
Merge pull request #3352 from ZappoMan/virtualEntities

tweaks to butterflies, animation, plus reformatting to match coding standard
Merge branch 'master' of github.com:highfidelity/hifi into 19935

Conflicts:
	interface/src/Menu.h