mail handler
Merge remote-tracking branch 'origin/master'

Conflicts:
	uberPaste/src/main/scala/uber/paste/mail/MailHandler.scala
mail handler