update
Merge
Merge branch 'developer' of https://github.com/TamoMaez/Competentietester into developer

Conflicts:
	bin/application/CompetentieTesterApp.class
	bin/controller/AbstractTestAction.class
	bin/controller/AbstractTestMouseAdapter.class
	bin/controller/AdminModeAction.class
	bin/controller/NewFileAction.class
	bin/controller/OpenFileAction.class
	bin/controller/SaveAsFileAction.class
	bin/controller/SaveFileAction.class
	bin/controller/UserModeAction.class
	bin/controller/UserTypeDoneAction.class
	bin/controller/category/CategoryDoneAction.class
	bin/controller/category/CategoryEditAction.class
	bin/controller/category/CategoryNewAction.class
	bin/controller/category/CategoryOverviewAction.class
	bin/controller/question/QuestionDoneAction.class
	bin/controller/question/QuestionEditAction.class
	bin/controller/question/QuestionNewAction.class
	bin/controller/question/QuestionOverviewAction.class
	bin/controller/settings/SettingsOverviewAction.class
	bin/database/FileManager.class
	bin/database/FileReader.class
	bin/database/FileWriter.class
	bin/database/ReadFromExcel.class
	bin/database/WriteToExcel.class
	bin/domain/Answer.class
	bin/domain/Category.class
	bin/domain/CompareByTimesAsked.class
	bin/domain/DomainException.class
	bin/domain/Feedback.class
	bin/domain/FeedbackType.class
	bin/domain/MCAnswer.class
	bin/domain/MCQuestion.class
	bin/domain/Option.class
	bin/domain/Question.class
	bin/domain/QuestionAnswerType.class
	bin/domain/QuestionType.class
	bin/domain/Score.class
	bin/domain/ScoreFeedback.class
	bin/domain/YesNoAnswer.class
	bin/domain/YesNoQuestion.class
	bin/domain/facade/CompetentieTesterFacade.class
	bin/domain/factory/AnswerFactory.class
	bin/domain/factory/FeedbackFactory.class
	bin/domain/factory/QuestionFactory.class
	bin/domain/questionSelectorStrategy/LeastAskedSelector.class
	bin/domain/questionSelectorStrategy/QuestionSelector.class
	bin/domain/questionSelectorStrategy/RandomMCSelector.class
	bin/domain/questionSelectorStrategy/RandomSelector.class
	bin/domain/questionSelectorStrategy/RandomYesNoSelector.class
	bin/domain/scoreCalculatorStrategy/GisScoreCalculator.class
	bin/domain/scoreCalculatorStrategy/ScoreCalculator.class
	bin/domain/scoreCalculatorStrategy/SumScoreCalculator.class
	bin/domain/scoreCalculatorStrategy/TimeScoreCalculator.class
	bin/view/ViewException.class
	bin/view/WelcomeView.class
	bin/view/panels/CategoryDetailPanel.class
	bin/view/panels/CategoryOverviewPanel.class
	bin/view/panels/CategoryTableModel.class
	bin/view/panels/MessagePanel.class
	bin/view/panels/QuestionDetailPanel.class
	bin/view/panels/QuestionOverviewPanel.class
	bin/view/panels/QuestionTableModel.class
	bin/view/panels/SidebarPanel$VerticalMenuBar.class
	bin/view/panels/SidebarPanel.class
	bin/view/panels/WelcomePanel.class
	src/controller/AdminModeAction.java
commit b4 merge