ISF gebruiker

Q: What comes after 69?

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

Conflicts:
	SchoolCup/SchoolCup.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SchoolCup/SchoolCup.WebUI.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SchoolCup/SchoolCup.WebUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SchoolCup/SchoolCup.v11.suo