test
dragging chat conversations
Merge branch 'master' of github.com:thydreamtech/chatboard

Conflicts:
	client/metero_demo_app.html
	client/temp/conversation.html