Merge branch 'hotfix-1.0.5' into develop
Fixed Invite Template
Fixed Redirect View
Added HTML Content type to Emails
Merge branch 'better-email' into develop
Merge branch 'develop'