Measurements of underlying event properties using neutral and charged particles in p-p collisions at 900 GeV and 7 TeV with the ATLAS detector at the LHC