Merged
Added error message
This should have been here
Fixed mailer issue for invite email, and hence payment acceptance
blanket commit