live edits on server
Merge branch 'develop' of http://github.com/hyperaudio-dev/ha-api into develop