removed nodedb
Merge server side code with client side commits for branch 'develop'