Merge branches 'develop' and 'master' of https://github.com/osamak/student-portal into develop
Merge branch 'hotfix-media-email-templates' into develop
Merge branch 'hotfix-add-informatics' into develop
Merge branch 'develop' of https://github.com/osamak/student-portal into develop
Merge branch 'hotfix-arshidni-admin' into develop
Merge branch 'hotfix-retry-page' into develop
Merge branch 'hotfix-change-password' into develop
Merge branch 'master' into develop
Merge branch 'hotfix-show-activity' into develop
Merge branch 'hotfix-members-page' into develop
Merge branch 'hotfix-club-activity-list' into develop
Merge branch 'upgrade-datatables' into develop
Merge branch 'hotfix-custom-css' into develop
Merge branch 'develop' of https://github.com/osamak/student-portal into develop
Merge branch 'hotfix-server-changes' into develop
Merge branch 'hotfix-activities-page-notloggedin' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfix-niqati-big-orders' into develop
Merge branch 'hotfix-activity-edits' into develop
Merge branch 'hotfix-niqati-notifications' into develop