Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into messages
fixes to back end
Merge pull request #188 from worxli/messages

Messages