Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
Removed deadlock from merge
smaller damage
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes

Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
removing unused variable
Fixing build warnings
Adding virtual destructor to Shape class
Fixing warnings and out-of-range index.
removing unused variables
remove if checks in cases where delete handles null
fix warning about signed/unsigned comparison
fix warning about signed/unsigned comparison
Review fixes
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
fix warning for unused variable (we forgot to use it)
fix for windows
fix for warnings about signed/unsigned comparison
Workin on LOD support in streaming.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
adding warnings to linux build