Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
Déplacement des dossiers Controllers de Content, hors du fichier Content
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
deplacement
suppr
Personne
delete ligne "@Scripts.Render("~/bundles/jqueryval")"
.
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan

Conflicts:
	YourSport/Controllers/HomeController.cs
	YourSport/YourSport.csproj
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/YourSport.csproj
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/YourSport.csproj
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
Commit Inscription (début)
csproj after alleaume create
Merge branch 'dev_cjourdan' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/Controllers/HomeController.cs
	YourSport/YourSport.csproj
	YourSport/YourSport.csproj.orig
fix search
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_adebag

Conflicts:
	YourSport/Views/Home/Index.cshtml
	YourSport/YourSport.csproj