Ajax uploading files
Fix Pusher
Add downloading file
New search user
New add
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
Merge branch 'new_verst' into develop

Conflicts:
	app/assets/javascripts/messages.js
	app/views/message/_dialog.html.haml
Changed user profile
Conflicts fixed
Added friends to rooms and user friends list
new verst with some fix
Merge branch 'user_profile_new_design' into develop

Conflicts:
	app/assets/javascripts/messages.js
	app/assets/stylesheets/users.css.scss
	app/controllers/message_controller.rb
	app/views/layouts/_rooms_list.html.haml
	app/views/message/_dialog.html.haml