Merge branch 'master', remote-tracking branch 'origin' into opening_hours
fixed changes