Emailer disabled
reenabled mailer
merging development into master