Merge branch 'master' into Eran
sort report by season
fix integrated  forecast calc
Merge branch 'Eran'
Merge branch 'master' into Gaby
Fixes to locale