commiting changes done on the javascript
Merge branch 'master' into ajax

Conflicts:
	app/assets/javascripts/chatrooms.js
	app/views/chatroom/room.html.erb