Merge branch 'master' of https://github.com/pilight/pilight

Conflicts:
	daemon.c
	receive.c
Merge branch 'master' of github.com:sweetpi/pilight
readme notice