Live Discussion Service
Merge pull request #51 from Caf131/dev-chris

Live Discussion Service
Merge pull request #15 from Caf131/master

Updates