Integrate previewer and fix broken tests
Merge pull request #27 from BBC-News/CONNPOL-147

Integrate previewer and fix broken tests