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
Merge pull request #337 from tschw/19165

19165