add user delete confirmation
delete confirmation
Added statuses to users
merge
Merge branch 'fr_st'
status with pusher,offline time in tooltip and new room with dblclick
Merge branch 'develop' into ajax_upload_file

Conflicts:
	app/assets/javascripts/messages.js
	app/assets/javascripts/rooms.js
	app/controllers/message_controller.rb
	app/controllers/rooms_controller.rb
	app/controllers/users_controller.rb
Merge branch 'ajax_upload_file' of github.com:SBS-team/chaaat into ajax_upload_file
Merge branch 'ajax_upload_file' into develop
new_verstkf
Merge branch 'new_verst' into develop

Conflicts:
	app/assets/javascripts/messages.js
	app/views/message/_dialog.html.haml
Fix js and sending messages