Refactored a bit
Merge branch 'master' of https://github.com/matanc1/smarthome

Conflicts:
	addon_manager/addon_manager.py