fixes for student residences
Merge remote-tracking branch 'upstream/master'