public marks

PUBLIC MARKS from gn_almeida with tags feeds & 2.2