library commit
Merge origin/master

Conflicts:
	src/test/panels/Answer.java
	src/test/panels/LogStudent.java
	src/test/panels/LogTeacher.java
	src/test/panels/Question.java
	src/test/panels/QuestionType.java
	src/test/panels/Statistics.java
	src/test/panels/Student.java
	src/test/panels/Teacher.java
	src/test/panels/Test.java
	src/test/panels/TestService.java
	src/test/panels/TestServiceTeacher.java
Merge origin/master

Conflicts:
	src/test/panels/Answer.java
	src/test/panels/LogStudent.java
	src/test/panels/LogTeacher.java
	src/test/panels/Question.java
	src/test/panels/QuestionType.java
	src/test/panels/Statistics.java
	src/test/panels/Student.java
	src/test/panels/Teacher.java
	src/test/panels/Test.java
	src/test/panels/TestService.java
	src/test/panels/TestServiceTeacher.java
Merge origin/master

Conflicts:
	src/test/panels/Answer.java
	src/test/panels/LogStudent.java
	src/test/panels/LogTeacher.java
	src/test/panels/Question.java
	src/test/panels/QuestionType.java
	src/test/panels/Statistics.java
	src/test/panels/Student.java
	src/test/panels/Teacher.java
	src/test/panels/Test.java
	src/test/panels/TestService.java
	src/test/panels/TestServiceTeacher.java