push
Merge remote-tracking branch 'origin/master'

Conflicts:

	FacturatieSysteem/src/facturatieSysteem/FacturatieSubsysteem/BusinessLayer/FacturatieManagerImpl.java

	FacturatieSysteem/src/facturatieSysteem/FacturatieSubsysteem/DataStoreLayer/FactuurDAO.java
Merge branch 'master' of https://github.com/Jeroen-N/Facturatie