Feature/0115 See merge request !9
Conflicts: code/apps/shop/views/Edit.html
Feature/0117 See merge request !7
Master See merge request !6