Merge branch 'master' of https://github.com/matanc1/smarthome
Also added .idea to gitignore.

Conflicts:
	addons/lights.py
Merge branch 'master' of https://github.com/matanc1/smarthome