Fixed a bug with discount message not appearing if the user is eligible for another discount even if that doesn't apply for the current event.
Merge branch 'discount-msg-fix'

Conflicts:
	cividiscount.php