hooked up emails
Merge remote-tracking branch 'origin/develop' into develop
updated urls for messaging so they dont need the speciality in the url as we dont know at time of sending
added a message
merged
fixed tests