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/View/ExamOverview.java
Merge origin/master

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

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

Conflicts:
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
Merge origin/master

Conflicts:
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/Question.java
	src/melt/Util/SQLHelper.java
	src/melt/View/AddExam.java
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SettingExam.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/Question.java
	src/melt/Util/SQLHelper.java
	src/melt/View/AddExam.java
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SettingExam.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/Question.java
	src/melt/Util/SQLHelper.java
	src/melt/View/AddExam.java
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SettingExam.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/Question.java
	src/melt/Util/SQLHelper.java
	src/melt/View/AddExam.java
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SettingExam.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/Question.java
	src/melt/Util/SQLHelper.java
	src/melt/View/AddExam.java
	src/melt/View/AddSection.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SectionPanel.java
	src/melt/View/SettingExam.java
	src/melt/View/SubsectionPanel.java
Merge origin/master

Conflicts:
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Util/jdbc.properties
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Util/jdbc.properties
Merge origin/master into allmamo-master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/QuestionDAO.java
	src/melt/Main.java
	src/melt/Util/SQLHelper.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
Merge pull request #10 from AoteChou/master

fix the bugs
Merge origin/master into allmamo-master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/QuestionDAO.java
	src/melt/Main.java
	src/melt/Util/SQLHelper.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
Merge branch 'allmamo-master'
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/EditQuestion.java
	src/melt/View/AddQuestion.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/EditQuestion.java
	src/melt/View/AddQuestion.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java