Merge origin/master

Conflicts:
	app.js
Add Leave(room)