Merge branch 'feature/cashbox_vc' into develop
Merge branch 'feature/cashobx_logic' into develop