con't
Merge branch 'master' of https://github.com/ZCH-DeliciousDishes/DeliciousDishesXamarinApp

Conflicts:
	DeliciousDishes.XamForms.Tests/DeliciousDishes.XamForms.Tests.csproj
	DeliciousDishes.XamForms.sln
doing the right test project