pull error...
first
merge
Controle des experts a la racine
fixed controller before merge
Merge branch 'extendedmodel' into develop

Conflicts:
	app/controllers/experts_controller.rb
	app/controllers/judges_controller.rb
	app/controllers/missions_controller.rb
	app/controllers/ratings_controller.rb
	app/controllers/skills_controller.rb
	db/migrate/20141119203503_create_experts.rb
	db/seeds.rb