Добавлен класс TypeInQuestionState
Merge branch 'master' of https://github.com/alexey-malov/ood2014kurs

Conflicts:
	QuizPlayer/libqp/libqp.vcxproj
	QuizPlayer/libqp/libqp.vcxproj.filters
	QuizPlayer/libqp/libqptests/libqptests.vcxproj.filters
Merge branch 'master' of https://github.com/alexey-malov/ood2014kurs
Добавлен класс TypeInQuestionState