add/delete answers
Merge https://github.com/migunovAlex/SchoolQuiz

Conflicts:
	SchoolQuiz/WebContent/WEB-INF/classes/com/schoolquiz/persistence/QuizDAOImpl.class