Added Essay to Exam UI
Merge origin/master

Conflicts:
	src/sols/DAO/Essay_DAO.java
	src/sols/Main.java
	src/sols/Model/Essay.java
	src/sols/View/ChooseQuestionsPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/img/essay-icon.png
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/Model/Section.java
	src/melt/Util/jdbc.properties
	src/melt/View/AddExam.java
	src/melt/View/AddQuestion.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddQuestionFib.java
	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/QuestionChoicePanel.java
	src/melt/View/QuestionPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.form
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/img/essay-icon.png
	src/melt/DAO/Exam_DAO.java
	src/melt/Main.java
	src/melt/Model/Exam.java
	src/melt/Model/Section.java
	src/melt/Util/jdbc.properties
	src/melt/View/AddExam.java
	src/melt/View/AddQuestion.java
	src/melt/View/AddQuestionFib.form
	src/melt/View/AddQuestionFib.java
	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/QuestionChoicePanel.java
	src/melt/View/QuestionPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SectionPanel_Preview.java
	src/melt/View/SettingExam.java
	src/melt/View/StartupPanel.form
	src/melt/View/StartupPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/View/SubsectionPanel_Preview.java
Added Essay to Exam UI
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Section_DAO.java
	src/melt/View/AddQuestionFib.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/SectionPanel_Preview.java
Merge pull request #25 from AoteChou/master

sds
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Section_DAO.java
	src/melt/View/AddQuestionFib.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/SectionPanel_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:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/View/QuestionPanel.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/View/QuestionPanel.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/View/SubsectionPanel.java
Merge pull request #26 from gegeabdullah/master

my changes
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	src/melt/DAO/Essay_DAO.java
	src/melt/Model/Essay.java
Merge origin/master

Conflicts:
	src/melt/DAO/Essay_DAO.java
	src/melt/Model/Essay.java
Merge pull request #27 from allmamo/master

Added Essay to Exam UI
add preview when editing
Merge origin/master

Conflicts:
	src/melt/View/ExamPreview.java
Merge origin/master

Conflicts:
	src/melt/View/ExamPreview.java