fixes fixes fixes
fixed die shizzle

Conflicts:
	analogswitch.h
	contactswitch.h
we did stuffMerge branch 'master' of https://github.com/diedoman/domotica

Conflicts:
	analogswitch.cpp