add admins
update mail
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	app/mailers/base_mailer.rb
	app/views/base_mailer/newsletter.html.erb
update mail