test

test
Merge branch 'master' of https://github.com/GreenSpider/Google

Conflicts:
	SchoolCup/SchoolCup.Model/DAL/SchoolCupDataManager.cs
	SchoolCup/SchoolCup.Model/POCO/Event.cs
	SchoolCup/SchoolCup.Model/POCO/ISF.cs
	SchoolCup/SchoolCup.Model/obj/Debug/SchoolCup.Model.Resources.Foutmeldingen.resources
	SchoolCup/SchoolCup.Model/obj/Debug/SchoolCup.Model.csproj.GenerateResource.Cache