New Client volledig functioneel + bugfixes
Mergefix
Mergefix2