Changed user profile
Conflicts fixed
Added friends to rooms and user friends list
new verst with some fix
Fix js and sending messages
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
prepare to develop
Merge branch 'ajax_upload_file' into develop

Conflicts:
	app/assets/javascripts/main.js
	app/views/layouts/_rooms_list.html.haml
	app/views/message/_dialog.html.haml