public marks

PUBLIC MARKS from crazybaud with tags compare & dev.web.cms