empty client and user model
Merge branch 'feature/config' into develop