Merge branch 'master' into Eran
weather import from scaffold page
Merge branch 'Eran'