Merge branch 'test3' of https://github.com/DRI-Dev/dricode into test3

Conflicts:
	nodeapi/routes/server.js
	nodeapi/web.js