# Conflicts:
#	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java

# Conflicts:
#	application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java
#	application/model/src/main/java/org/fuseri/model/dto/lecture/LectureDto.java
#	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java

M2 certificate response entity

See merge request !24

M2 course tests

See merge request !23

M2 exercise tests

See merge request !25

# Conflicts:
#   application/module-exercise/src/main/java/org/fuseri/moduleexercise/answer/AnswerFacade.java
#   application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionController.java
#   application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionFacade.java
#   application/module-exercise/src/main/java/org/fuseri/moduleexercise/question/QuestionService.java

M2 user tests

See merge request !26