Fixed merge errors

Signed-off-by: Oliver Libutzki <oliver@libutzki.de>
Merge branch 'newmaster' of https://github.com/OLibutzki/smarthome into newmaster