Merge branch 'arshidni-home-hotfix'
Added missing email templates
Merge branch 'hotfix-media-email-templates'
Merge branch 'master' of https://github.com/osamak/student-portal
Add College of Public Health and Health Informatics.
Merge branch 'hotfix-add-informatics'
Setting the name is enough.  Otherwise the arshidni admin won't work properly.
Merge branch 'hotfix-arshidni-admin'
Corrected permissions
Deanship reviewers can view activity page when the activity is approved by presidency and not (yet) approved by deanship
Increase the expiration limit, and make it possible to request email resend.
Merge branch 'hotfix-retry-page'
Make it possible to change password.
Merge branch 'hotfix-change-password'
Publish server modifications.
Merge branch 'hotfix-comment-media'
Accounts for view_activity permission
Updated tests
Updated tests - mistake correction
Merge branch 'hotfix-show-activity'
Added members view with link from show club view
Added view_members permission