That is the manned Dragon, which will have an integral escape system allowing the capsule to be boosted away from the launcher during any part of flight. But that same system can be used to provide powered landings.
Yep - Elon talked about this about an hour ago in the post-splashdown press conference and said the future dragon will be able to do precision soft landings where there is little atmosphere or no atmosphere, so we can deliver payloads to other bodies in the Solar System. I love how he also said it's how spaceships simply should do a landing. (He didn't quite say that's how God and Heinlein would have wanted it, but same idea.)
