Merge pull request #224 from fsr-itse/develop

Merge develop into master
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
fixed bug where delegate didn't see courses when id and userprofile.id from represented user were different
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
merge develop
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop'
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'master' of https://github.com/fsr-itse/EvaP
Merge remote-tracking branch 'origin/master' into develop