-- added cancel button to email notifications
Merge branch 'master' of github.com:project-open/intranet-forum