js to coffee
js to coffee v2
fix coffee v.1
fixed global variables in coffee
remove .js
correct view of login in message.coffee
update pusher controller
fix dialog
fixing if
add main.js
Merge branch 'fix_dialog' into js_to_coffee

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/messages.coffee
	app/assets/javascripts/pusher.coffee
	app/assets/javascripts/rooms.coffee
castomized scrolls in room, left panel, and room list
Merge branch 'js_to_coffee' of https://github.com/SBS-team/chaaat into js_to_coffee

Conflicts:
	app/assets/javascripts/main.js
	app/views/layouts/_rooms_list.html.haml
	app/views/messages/_dialog.html.haml
add nanoscroll files
Merge branch 'js_to_coffee' of github.com:SBS-team/chaaat into js_to_coffee

Conflicts:
	app/assets/javascripts/main.coffee
	app/assets/stylesheets/all.css
	app/views/messages/_dialog.html.haml
Merge branch 'js_to_coffee' of https://github.com/SBS-team/chaaat into js_to_coffee

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/main.js
	app/assets/javascripts/messages.js
	app/assets/javascripts/pusher.js
	app/assets/javascripts/rooms.js
	app/assets/stylesheets/lobby.css
	app/controllers/rooms_controller.rb
	app/controllers/users_controller.rb
	app/views/layouts/_rooms_list.html.haml
	app/views/messages/_dialog.html.haml
add new features
Merge branch 'js_to_coffee' into develop

Conflicts:
	app/assets/javascripts/user.js
	app/helpers/rooms_helper.rb