Merge pull request #9 from alemaitour/master

MAJ Project
account
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
messagerie
csproj
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData

Conflicts:
	YourSport/Views/Shared/_Layout.cshtml
	YourSport/YourSport.csproj
fix messagerie
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_ccaly
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_ccaly
test jqgrid
jqgrid ok !
fix messagerie one-to-one
messagerie part
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_adebag
Mise à niveau Alleaume