Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/View/AddExam.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/EditQuestionFIB.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/ExamPreview.java
	src/melt/View/QuestionChoicePanel.form
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/View/AddExam.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/EditQuestionFIB.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/ExamPreview.java
	src/melt/View/QuestionChoicePanel.form
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/View/AddExam.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/EditQuestionFIB.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/ExamPreview.java
	src/melt/View/QuestionChoicePanel.form
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/View/AddExam.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/EditQuestionFIB.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/ExamPreview.java
	src/melt/View/QuestionChoicePanel.form
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/View/AddExam.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/EditQuestionFIB.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/ExamPreview.java
	src/melt/View/QuestionChoicePanel.form
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Merge origin/master

Conflicts:
	src/melt/View/ExamPreview.java