bang !
Merge branch 'master' into ol_nouvellefonc

Conflicts:
	MvcApplication1/Views/Shared/_Layout.cshtml
Fix