Ajout de la function newsletter
Ajout newsletter
Merge branch 'master' of github.com:sitexw/Jam

Conflicts:
	app/views/admin/orders/new.html.erb