update to workspace
using html base
Merge remote-tracking branch 'origin/node-chat' into node-chat

Conflicts:
	.idea/workspace.xml