etl u6
etl u6
Merge branch 'master' of https://github.com/utwente-di/di02

Conflicts:
	werkende versie workspace/flatportal-final/src/main/webapp/eetlijst.jsp
	werkende versie workspace/flatportal-final/target/flatportal-final.war