je sais pas
Merge branch 'master' of https://github.com/AxelS33/Wayz

Conflicts:
	BusinessLayer/BusinessLayer/BusinessLayer.csproj
	WaysServices/WaysServices.sln