JUNIT
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/WEB-INF/classes/controller/listener/AgendaFilter.class
	war/WEB-INF/classes/controller/listener/ContextListenerServlet.class
	war/WEB-INF/classes/controller/listener/SecurityFilter.class
	war/WEB-INF/classes/controller/listener/TestDataServlet.class
	war/WEB-INF/classes/controller/login/LoginServlet.class
	war/WEB-INF/classes/model/agenda/Agenda.class
	war/WEB-INF/classes/model/agenda/Monteur.class
	war/WEB-INF/classes/model/agenda/Reparatie.class
	war/WEB-INF/classes/model/klantenbinding/Klandizie.class
	war/WEB-INF/classes/model/klantenbinding/Klant.class
	war/WEB-INF/classes/model/parkeergarage/Garage.class
	war/WEB-INF/classes/model/users/UserControl.class
	war/WEB-INF/classes/model/voorraadbeheer/Magazijn.class
	war/WEB-INF/classes/model/voorraadbeheer/Onderdeel.class