Barcelona have been handed a huge boost ahead of Saturday's Clasico after Lionel Messi resumed training with the first team squad.