A huge plume of smoke could be seen from as far away as Fife on Sunday evening.
Hundreds took part in the parade which displayed music, dance and costumes from around the world.
The 43-year-old was taken to the city's Royal Infirmary on Friday evening and is in a critical condition.
A 54-year-old man was taken to hospital with 'serious injuries' following the incident in Muirhouse.
Scotland flanker Hamish Watson has signed for Castres after leaving Edinburgh.
A five-year restoration project saw thousands of rare species moved and replanted at the Edinburgh site.
Catherine Ritchie was forced to abandon her flat in Bonnington after a fire two years ago and does not know when she will be back.
David MacDonald was found guilty of multiple charges following more than 13 years of physical and domestic abuse directed at his estranged wife.
An Amnesty report which classed Beira's Place as "anti rights" has been removed, but the support centre demands further action.
