Ajout active admin
Corrections
Merge branch 'master' into activeadmin

Conflicts:
	app/models/user.rb
	config/initializers/active_admin.rb
	config/routes.rb
	db/schema.rb