Merge branch 'master' of https://github.com/pcman75/sonosremote

Conflicts:
server/sonosHttpebbleCommand.py
conflict solve