Add watermark sample
Alberto contrib of 9 July - nested complex fields
remove old InFIeld stuff from PdfConversionContext