Favorites plus sharerooms

Great big merge of ShareRooms plus Favorites (and the template changes)