Merge pull request #1 from Activiti/master

Merging
Fix JSON to BPMN model conversion issue
Fix JSON to BPMN model conversion issue
Merge pull request #161 from balsarori/json_converter

Fix #160