Added missing transmitter files
Fixed conflicts
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #371 from PhilipRosedale/master

Missing Transmitter files committed