Merge branch 'master' of https://github.com/AoteChou/MELT into AoteChou-master

Conflicts:
	src/melt/View/AddQuestion.java
	src/melt/View/ChooseQuestionsPanel.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/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