Updated quiz editing
Merge branch 'master' of https://github.com/WadeOne/EasyTeach

Conflicts:
	EasyTeach.Core/EasyTeach.Core.csproj
	EasyTeach.Web/EasyTeach.Web.csproj