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