Stuff

nkcnakl
Merge remote-tracking branch 'origin/master'

Conflicts:
	EduPortal.API/EduPortal.API.csproj
	EduPortal.API/Views/School/Index.cshtml