Khartoum begins rebuilding as 2 million people expected to return by the end of the year