merdeuh !
Merge branch 'master' of https://github.com/HappyDestroy/GetMyCard

Conflicts:
	GetMyCard/ViewModels/ViewModelMaCarte.cs.orig
	GetMyCard/ViewModels/ViewModelMainPage.cs
	GetMyCard/Views/MaCarte.xaml.orig
fsqffdqf
Merge branch 'master' of https://github.com/HappyDestroy/GetMyCard

Conflicts:
	GetMyCard/ViewModels/ViewModelMaCarte.cs
	GetMyCard/ViewModels/ViewModelMaCarte.cs.orig
	GetMyCard/ViewModels/ViewModelMainPage.cs
	GetMyCard/ViewModels/ViewModelMainPage.cs.orig
my change
modif nini 26/05/14