adding friends to room
Merge branch 'develop' of github.com:SBS-team/chaaat into upd_room_fr
Adding friends and showing 10 last messages when search
Adding friend to room with theirs status
Fixed conflicts, adding/removing friends in user profile
Merge branch 'develop' into upd_room_fr

Conflicts:
	app/views/layouts/_rooms_list.html.haml
Merge branch 'upd_room_fr' into develop