Merge pull request #111 from tbrooke/ui

Merge of master with pdf creation and pagination into UI branch
Merge remote-tracking branch 'upstream/ui' into ui