WIP
Merge branch 'dev' into zoom
WIP
WIP
Merge branch 'zoom' of https://github.com/ciudadanointeligente/vizard into zoom
Merge branch 'dev' into zoom
Mueve texto zoom dentro de persona.
Merge branch 'zoom' of https://github.com/ciudadanointeligente/vizard into zoom

Conflicts:
	app/assets/javascripts/bpmn.js
	app/assets/javascripts/vizard-extras.js