Well, the two are merged into one big web application that's called the Activiti Explorer. But it actually consists of 2 components, the Activiti Modeler and the Explorer.
The Activiti Modeler is a web-based BPMN modeling tool where you can model your process definitions. The Activiti Explorer is a the application where you can start new process instances, complete tasks etc.
Best regards,
Tijs