add changes from master
add changes from master
Merge branch 'studip-2.2' of github.com:studip/studip-rest.ip into studip-2.2