added missing files
Merge branch 'zapfkit-client-rework'