Conference bugs fixed.
Merged from trunk.
merge from lp:~peter-simpson/openpetraorg/dev_0002092_discount_criteria_missing
merge from lp:openpetraorg