Merge branch 'develop'
work in the email system so there is a notice to all attached users on a new issue or comment of the project
Merge branch 'master' into develop