added discounts to memberships
fixes
merged with master, fix error for undeclared fields
Default discount_eligible to false.
Merge branch 'master' into 460_membership_discounts
Updated migrations, and added fixes
#27: Custom notices for corporate memberships
Merge branch 'master' into bixly-merge-ready
#28: Add Profiles in django admin
#44: Additional changes to user merge
#121: Update Membership Reports
#26: Recurring payments confirmation text
#27: Additional changes for corporate membership custom notices
#27: Added rep_first_name and renewed_individuals_list tokens
Merge branch 'refs/heads/master' into bixly-merge-ready
Pass reply_to to the notification.send_emails only if there is a valid sender email address.
Added back the notification corp_memb_join_approved in the case if notice is not set up.
Added back the notification corp_memb_renewal_approved in the case if the notice is not set up.
Add 5 additional tokens to the corp notices.
Update fixture content for corp notices.