Agenda Controller
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	.gitignore
	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/secure/control-panel/agenda/index.jsp
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	.gitignore
	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/secure/control-panel/agenda/index.jsp