Sync werkt met recursie
Merge branch 'master' of https://github.com/BioDice/OS3CS

Conflicts:
	OS3Client/config.xml
	OS3Server/config.xml