Merge branch 'hotfix-piwik-for-accounts'
Merge branch 'add-activity-even-if-not-coordinator'
Merge branch 'management-fixes'
Revert "Merge branch 'management-fixes'"

This reverts commit 4ca590a9094278033b4c5d9037b89e0fafaf4b53, reversing
changes made to 166f16a8083d0dc34e0dc4f35c24f8cd5af56b89.
Merge branch 'master' of https://github.com/osamak/student-portal
Merge branch 'develop'
Revert "Revert "Merge branch 'management-fixes'""

This reverts commit f27fd89beb91e8be5fcfcc2cd0d21cf869afab3a.
Merge branch 'develop'
Merge branch 'master' of https://github.com/osamak/student-portal
Bugfix. The email here needs to be sent to the employee.
Merge branch 'fix-employee-email' into develop
Merge branch 'develop' of https://github.com/osamak/student-portal into develop