I fix
Merge branch 'master' of https://github.com/Deam/LeenMeij

Conflicts:
	src/nl/hsleiden/ipsen2/inf2b1/g2/controllers/CustomerController.java
	src/nl/hsleiden/ipsen2/inf2b1/g2/utils/Table.java
	src/nl/hsleiden/ipsen2/inf2b1/g2/views/admin/AdminView.java