More mailer tweaks, still does not work properly
Merge branch 'develop' of github.com:guluc3m/gul-gultalks into develop

Conflicts:
	app/mailers/notifier.rb