added third query to showByGeo method to ensure that expired rooms aren't shown to users
Merge branch 'errorHandling'

merging in update to showByGeo method in server-side room.controller