Added Essay to Exam UI
Added Essay to Exam UI
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 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