Fixed weather script.
Merge branch 'master' into dev2

Conflicts:
	tools/src/simple/weather.py
Merge branch 'dev2'