abemus realtime ?
Merge branch 'master' of https://github.com/redmintlabs/hackaton-bootstrap

Conflicts:
	app/assets/javascripts/application.js
	app/views/conversations/index.html.haml