android modelklassen aanpassen
Merge branch 'master' of https://github.com/GreenSpider/Google

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