add conversations scaffold
Merge remote-tracking branch 'origin/master' into authorisation

Conflicts:
	app/models/ability.rb
	config/routes.rb
	db/schema.rb
Merge
merge barons changes
merge barons updates