Écran exemple
Merge remote-tracking branch 'origin/master'

Conflicts:
	Solution/Application/Application.csproj