mop

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

Conflicts:
	SchoolCup/SchoolCup.Model/obj/Debug/SchoolCup.Model.csproj.GenerateResource.Cache
	SchoolCup/SchoolCup.v11.suo