click on navbar was giving error
Add attribute to User 'receive_mailings'
mailing opt-out in user settings
WIP
console mailer specs
Changed variables names to match contant format
remove empy line - just to kick off merge-branch in travis
Merge pull request #370 from erpe/mailing_opt_out

Mailing opt out
Merge pull request #371 from apelade/navbar

click on navbar was giving js error
fix slipped through typo in bulk_mailer and adjust specs to catch this
Merge pull request #374 from erpe/bulk_mailer_typo

fix slipped through typo in bulk_mailer and adjust specs to catch this
Merge branch 'develop' of https://github.com/sampritipanda/WebsiteOne into refactoring

Conflicts:
	db/schema.rb