Merge branch 'arshidni-home-hotfix'
Merge branches 'develop' and 'master' of https://github.com/osamak/student-portal into develop
Added missing email templates
Merge branch 'hotfix-media-email-templates' into develop