Revert "Merge branch 'feature-refactoring' into 'master'" See merge request redmic-project/server/socket!14