Add check for token
Merge branch 'master' of github.com:Davepar/thermostat-server