puts private members to the bottom of the class definition
adds comments and blank lines to clarify the code
Merge branch 'master' of git://github.com/worklist/hifi into 19165

Conflicts:
	interface/src/Oscilloscope.cpp
have addOrUpdateAgent return a pointer to the agent instead of a bool
attach stream identifier to AudioRingBuffer to match incoming data in audio mixer
fix the mod so we get values up to 255
Merge pull request #342 from birarda/voxel-noise

use stream identifier to match injected audio across packets
include time for srand on UNIX
Merge pull request #344 from birarda/voxel-noise

include time for srand on UNIX
correct the memcmp for audio stream identifier
Merge pull request #345 from birarda/voxel-noise

fix memcmp in audio-mixer main
fix broken eve due to extra quote
Merge pull request #346 from birarda/voxel-noise

fix broken eve
some fixes for new audio injector setup
Merge pull request #347 from birarda/voxel-noise

new audio injector setup fixes
reduce packets per second by packing multiple voxel edits into single packet and removed debugging
CR feedback
CR feedback
CR feedback
Merge pull request #348 from ZappoMan/voxel_animation

Improved Animation Server