Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
design
TennisBallOver_32.png
foundation
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
fix admin
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_ccaly
fix messagerie part
fix map
administration
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
fix messagerie
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
fix disponibilite mapping
Merge branch 'dev_ccaly' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/YourSport.csproj
Déplacement des dossiers Controllers de Content, hors du fichier Content
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
Merge branch 'dev_cjourdan' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/YourSport.csproj
fix messagerie + Search index
deplacement