Sorry - couldn't resist - yes, I do believe they landed.
Back on topic, I think there are too many conficting interests competing for NASA money - it will be difficult for them to
1. keep the shuttle going and
2. design a new reusable launch platform and
3. get back to the moon and
4. get to Mars and so on.
Iirc, Bush has committed to more manned exploration which probably means Hubble will be left to rot