fixing a bug with printing annual receipts when there are gifts and gifts in kind in mixed order
extending the demo formletter for the gift receipts to show the divs for gift in kind and monetary donation
merge from Branch lp:~tpokorra/openpetraorg/dev0002690_gift_in_kind_annual_receipts