Changes, Fixes, Improvements.
New email templates.
Merge remote-tracking branch 'origin/develop'