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

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

Conflicts:
	src/melt/View/ExamOverview.java
Added Essay to Exam UI
Merge pull request #1 from allmamo/master

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:
	src/sols/DAO/Essay_DAO.java
	src/sols/Main.java
	src/sols/Model/Essay.java
	src/sols/View/ChooseQuestionsPanel.java
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:
	src/sols/DAO/Essay_DAO.java
	src/sols/Main.java
	src/sols/Model/Essay.java
	src/sols/View/ChooseQuestionsPanel.java
Merge pull request #2 from gegeabdullah/master

sols updated
Merge origin/master

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

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

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
delete the subsection(should update the database)
delete the subsection(should update the database)