fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	evazbot/modules/m_weather.py