task #00026-Vinos_edit: Vinos add page addded
Merge branch '00026-Vinos_edit' into develop