fix view friends
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.haml
	app/views/users/show.html.haml
Merge branch 'develop' of github.com:SBS-team/chaaat into develop