Fixed: removing friends only in my account, validation on friendship added
setups capistrano suka blya
setups
merge
Fixed friendships controller and adding statuses to db
Removed files js.coffee
merge
changed deploy setups
delete duplicate gems from gemfile
fix emojify
delete schema
Changed view users#index
merge
Conflicts fixed
delete conflict

Conflicts:
	app/assets/javascripts/messages.js
	app/views/layouts/_index.html.haml
fix add to room
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
fix git ignore
merge
Merge branch 'develop' of github.com:SBS-team/chaaat into develop