TEST
TEST
TESTTTT
TESefklawjf;kljawklgfla
KLOTEZOOIO
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	nbproject/private/private.xml
	war/WEB-INF/built-jar.properties
	war/WEB-INF/classes/controller/listener/TestDataServlet.class
	war/WEB-INF/classes/model/agenda/Reparatie.class
	war/WEB-INF/classes/model/voorraadbeheer/Magazijn.class