public marks

PUBLIC MARKS from nhoizey with tags ajax & sans_flash