mailer ponderation
Merge branch 'master' of https://github.com/kevstessens/dealhunter

Conflicts:
	app/mailers/newsletter_mailer.rb
fix