fix arrows for hide and display lateral bars
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard
Added Organizations as groups and made them resizeable
Merge branch 'master' into design
Solved tooltip display bug, closes #45
Removed Annotations, closes #47
Borra doble borde de personas.
Merge branch 'master' into design
Merge branch 'design'
Estilo grupos.
Merge branch 'design'
Solved lateral bar hiding bug, closes #50
first implementation of caritas
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard
Added different person sizes, closes #52
Smaller canvas grid and added snaplines, closes #49
Merge branch 'master' of github.com:ciudadanointeligente/vizard

Conflicts:
	app/assets/javascripts/bpmn.js
	app/assets/javascripts/inspector.js
Persons and organizations are always on top, closes #53
Resizing for organizations
Merge branch 'master' into design