Call Diversion AS
Commit the rest of the code
Code review mark-ups
Merge pull request #20 from Metaswitch/sto985

[Reviewer: Andy] Call Diversion AS