Merge origin/master

Conflicts:
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java