A 16-year-old boy is among five more people who have been charged in connection with a mass brawl in Edinburgh.