meteo by olo
Merge branch 'master' of https://github.com/ElSzpsiako/MeteoICM

Conflicts:
	MARKET_APPS.txt