Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	ExamGenerator.v12.suo
	ExamGenerator/Views/Exam/Index.cshtml
	ExamGenerator/bin/ExamGenerator.dll
	ExamGenerator/bin/ExamGenerator.pdb
	ExamGenerator/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ExamGenerator/obj/Debug/ExamGenerator.dll
	ExamGenerator/obj/Debug/ExamGenerator.pdb