It was Madara, that's why he said he hasn't told anybody yet. Tobi, however, is Obito.. it is the only thing that makes sense. Madara would be too old.. The Edo Tensei idea is just ridiculous.. Madara just doesn't exist anymore, he just took that name to strike fear into people.
