Fixes no discount issues if priceset ID is null in cividiscount_item table. #32
Merge branch 'event-fix'
Discount promotion message wasn't showing up if the user is eligible for other discounts (but not that one applicable for that event)
Merge branch 'discount-msg'