modify servernode
Merge branch 'master' of github.com:wengia/tidepool_server
"merge with remote"