multy day events
Merge branch 'master' into scopes_fix