rails 4 working. still derpaciation warning
rails admin installé. Problème avec les migrations
Merge branch 'master' of github.com:facenord-sud/collaide into rails_ad

Conflicts:
	app/models/group/group_member.rb
	db/schema.rb
rails 4
group
Merge branch 'rails_ad'

Conflicts:
	Gemfile.lock
	app/models/group/group.rb
	app/models/group/group_member.rb
	db/schema.rb
qqe fichier enlenver
enlever test
modifs
modifs
modifs
ça vance