Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_adebag
Add view admin
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_ccaly
Ajout fonction d'édition lors d'un double clic sur une ligne

Attente fenêtre Inscription Carole
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_ccaly

Conflicts:
	YourSport/Controllers/HomeController.cs
	YourSport/YourSport.csproj
fix jqgrid design bottom
layout good
Mise à niveau Alleaume
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_adebag

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

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

Conflicts:
	YourSport/YourSport.csproj
Views
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
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
.
delete pour pull