task #00026-Vinos_edit: Feature added
Merge branch '00026-Vinos_edit' into develop