catching up the master
Merge branch 'master' of https://github.com/ercgroup/forecasting

Conflicts:
	Paper/!Forecast_paper.pdf