Merge pull request #10 from alemaitour/master

MAJ Project
Merge pull request #11 from alemaitour/master

MAJ Project
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_cjourdan
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
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 'dev_alemai' of https://github.com/alemaitour/OpenData into dev_cjourdan
Models : LoginViewModel
Models
fix carole
fix messagerie
fix disponibilite mapping
Merge branch 'dev_ccaly' of https://github.com/alemaitour/OpenData

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

Conflicts:
	YourSport/YourSport.csproj