Removed TODO
Additional documentation
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/matsukaze/hifi_nocr
Merge branch 'master' of https://github.com/highfidelity/hifi
Removed gettimeofday in AudioInjector
Removed gettimeofday in Audio
Removed gettimeofday in AudioMixer
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday

Conflicts:
	interface/src/Audio.cpp
Merge branch 'master' of https://github.com/highfidelity/hifi
More gettimeofday cleanup
Some gettimeofday removal fixes
Last touch to removing gettimeofday
Removed Systime.h includes
Job #19574. Add audio oscilloscope.'
Merge branch 'master' of https://github.com/highfidelity/hifi
Reverting inadvertently committed local changes.