fixes for student residences
update translation n show page
Merge remote-tracking branch 'upstream/master'
merge from master