Merge branch 'feature/basics4seller2' of github.com:siliconsalad/printing_machine into develop