Agular tour & features
Agular tour & features
use chat insetad of conversations; merge visitors with users
Merge branch 'angularTour'

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb