edicion#261

Borisamir wants to merge 2 commits intothegreenter:masterthegreenter/greenter:masterfrom

Borisamir:feature/edicionBorisamir/greenter:feature/edicionCopy head branch name to clipboard