Merge branch 'master' into Eran
weather import from scaffold page
Merge branch 'Eran'
Merge branch 'master' into Eran
merge
Add stadium to match on import
Merge branch 'Eran'
Merge branch 'Adar'
Merge branch 'master' into Adar