.
Merge branch 'master' of https://github.com/fazed/IVH5B5

Conflicts:
	FysioSysteem/Data/afspraken.xml
	FysioSysteem/src/fysioSysteem/domain/Behandeling.java