Merge pull request #337 from tschw/19165

19165
Merge branch 'master' of git://github.com/worklist/hifi
adjusts names
further adjusts naming
puts member variables last but first