Move  below last  calc to fix #2746
Add thrid parameter for  to edd_is_discount_valid(). Might fux #2682
Merge branch 'master' of github.com:easydigitaldownloads/Easy-Digital-Downloads
Remove download_id and options from edd_apply_preset_discount #2682
Updated pot file
Version bump and changelog
Tweaked changelog for 2.1.8
Merge branch 'master' into release/2.2