vide
Merge branch 'master' of https://github.com/14roiron/smartgrid

Conflicts:
	main.py
de
Merge branch 'master' of https://github.com/14roiron/smartgrid
xee
Merge branch 'master' of https://github.com/14roiron/smartgrid