Merge branch 'develop'
Merge branch 'develop'
[#25] Fix email bug

* Have to make sure that all
  normal email parameters are
  set, even if the field was
  not filled in (setFrom() for
  instance).
Merge branch 'task-25-fix_email_not_sending' into task-25-put_from_in_body_of_email
Merge branch 'task-25-put_from_in_body_of_email' into develop