Merge branch 'master' of https://github.com/tescher/HomewatchArduino.git

Conflicts:
	HomewatchArduino.ino

Signed-off-by: Tim Escher <tim@eschers.com>