bugfixes
Merge branch 'master' of github.com:Jocbe/SettingWork

Conflicts:
	target/classes/org/example/Question.class
	target/classes/org/example/QuestionController.class
	target/classes/org/example/QuestionSet.class
	target/classes/org/example/SessionFactoryManager.class
bugfixes