???
Merge branch 'master' of https://github.com/xgeodev/pysenorge.git

Conflicts:
	pysenorge/themes/wind_1500m_daily.py
Merge remote-tracking branch 'origin/master'
Again one version