vendors update
Merge branch 'working_hours' of github.com:Riland/sandbox into working_hours
vendors update