Updated userguide and readme
Readme and userguide
nodedb and server
Fixed conflicts