Updated server.
Merge branch 'master' of https://github.com/ader1990/smarthouse