Merge branch 'DataSourceKasper' of https://github.com/CodingCo/NewERP
jgjhgjh

hgjh
Merge branch 'master' into DataSourceKasper
fgg

Conflicts:
	src/dataSource/DbFacade.java
Merge branch 'DataSourceKasper' of
https://github.com/CodingCo/NewERP into DataSourceKasper

Conflicts:
	src/dataSource/DbFacade.java
	src/domain/Controller.java
læ

fgjk
Merge branch 'DataSourceKasper' of https://github.com/CodingCo/NewERP into DataSourceKasper

Conflicts:
	src/domain/Controller.java
bvbjvjhghu

knl
Modifed mapper classes

Added functionality to apartmentMapper and costumerMapper.
Updated UOW

Added ArrayLists
Added methods

Still changes/methods to be added but need to merge.

Reviewed by: Simon
Merge branch 'DataSourceKasper' of https://github.com/CodingCo/NewERP into DataSourceKasper

Conflicts:
	src/dataSource/ApartmentMapper.java
	src/dataSource/DbFacade.java
Merge branch 'DataSourceKasper' with master

Conflicts:
	src/dataSource/DbFacade.java
	src/domain/Controller.java
	methods are now available
	Reviewed by: Thomas