Make registerSwiftMailer public
Update Mailer.php

added missing class property
Fix conflicts.