first commit
second
fix production for heroku
fix images
fix style
add dropbox V1
Fix me
fixme pusher
FIXME fix
fisrt update
Merge branch 'develop' into firstname

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/drag_and_drop.js
	app/assets/javascripts/main.coffee
	app/assets/javascripts/messages.coffee
	app/assets/javascripts/video.coffee
	app/assets/stylesheets/all.css
	app/assets/stylesheets/chat.css.scss
	app/assets/stylesheets/users.css.scss
	app/controllers/application_controller.rb
	app/controllers/friendships_controller.rb
	app/controllers/messages_controller.rb
	app/controllers/rooms_controller.rb
	app/controllers/rooms_users_controller.rb
	app/models/user.rb
	app/views/devise/registrations/_edit_modal.haml
	app/views/devise/sessions/new.html.haml
	app/views/layouts/_navigation_links.html.haml
	app/views/layouts/_rooms_list.html.haml
	app/views/layouts/application.html.haml
	app/views/messages/_dialog.html.haml
	app/views/rooms/_show_rooms_list.html.haml
	app/views/rooms/index.html.haml
	config/deploy.rb
	config/environments/development.rb
	config/environments/production.rb
	db/schema.rb
	spec/controllers/messages_controller_spec.rb
firstname, lastname
add firstname lastname into left panel
Merge branch 'develop' into firstname
firstname and lastname
firstname and lastname
add login into friend table rooms_group
Merge branch 'firstname' of github.com:SBS-team/chaaat into firstname
add firstname/lastname into right block, and add tooltip into the search
fixed _dialog.html.haml