Merge origin/WSserver into WS_with_DBconnect

Conflicts:
	README.md