Merge branch 'chat' of https://gitlab.com/diguliu/noosfero into cirandas

Conflicts:
	app/helpers/layout_helper.rb
	app/views/layouts/chat.html.erb
	public/javascripts/application.js
	public/stylesheets/application.css