Charlie Hebdo magazine to return with 2.5 million copies