markable gem and favoriting model
fixed merge conflicts - merged favourites branch