Added a note to the BpmnParseHandler section regarding custom implementations (see http://forums.activiti.org/content/custom-bpmnparsehandler-duplicate-activity-error)
Merge branch 'master' of github.com:Activiti/Activiti