Merge and resolve conflict on APplication.cpp
Switch members in EntityItemProperties to hack around corruption bug
Switch members in EntityItemProperties to hack around corruption bug
Merge pull request #3766 from Atlante45/corruption_bug

Switch members in EntityItemProperties to hack around corruption bug
fix a bug produced by not setting deleted var to NULL
Merge pull request #3767 from birarda/plugs

fix a bug produced by not setting deleted var to NULL
Added merged flag to Spanner.
Merge branch 'master' of https://github.com/highfidelity/hifi

Conflicts:
	interface/src/Application.cpp
Set face.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
The spec actually says that the 'L' (should have been 'LL' anyway) isn't
necessary; the compiler will know to read the constant as a long long.
Mixer send mute when if too noisy
make mute icon pulsate when muted
Merge remote-tracking branch 'hifi/master'
make pulsate function into a cos
return value by reference
Set a minimum mute intervalle in the mixer
Extra space
Moved spanners into separate file, working on heightfields as spanners.
add a guard in case local audio cannot be handled