Merge remote-tracking branch 'origin/master'

Conflicts:
	web-server/Root.py
Merge branch 'master' of https://github.com/rojters/breezehome

Conflicts:
	web-server/Root.py