New merge
Merge branch 'master' of https://github.com/eelcor/greenhouse_projects

Conflicts:
	web_test/logger_base.pyc
	web_test/weather.pyc
Merge