just syncing no changes made
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExamMaker.v12.suo
	ExamMaker/bin/Debug/ExamMaker.exe
	ExamMaker/bin/Debug/ExamMaker.pdb
	ExamMaker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ExamMaker/obj/Debug/ExamMaker.csproj.FileListAbsolute.txt
	ExamMaker/obj/Debug/ExamMaker.csproj.GenerateResource.Cache
	ExamMaker/obj/Debug/ExamMaker.exe
	ExamMaker/obj/Debug/ExamMaker.pdb
	ExamMaker/obj/Debug/ExamMaker_MarkupCompile.cache
	ExamMaker/obj/Debug/ExamMaker_MarkupCompile.i.cache
	ExamMaker/obj/Debug/ExamMaker_MarkupCompile.lref