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