Fixed: removing friends only in my account, validation on friendship added
Fixed friendships controller and adding statuses to db
Removed files js.coffee
fix emojify
Changed view users#index
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
merge
Merge branch 'develop' of github.com:SBS-team/chaaat into develop
devise token
typo fix
fix assets
fix assets
fix assets p2
fix
chendes
pull chenge
fix data_base