updates van jiry
Merge branch 'master' of https://github.com/Jfeurich/Themaopdracht2

Conflicts:
	Themaopdracht/war/WEB-INF/web.xml
Merge branch 'master' of https://github.com/Jfeurich/Themaopdracht2

Conflicts:
	Themaopdracht/src/servlets/NieuweFactuurServlet.java
	Themaopdracht/war/WEB-INF/web.xml