rails v 4.1.0
add button for sending messages
Merge branch 'develop' of github.com:SBS-team/chaaat into develop

Conflicts:
	app/views/layouts/_rooms_list.html.haml