Merge branch 'mutexProb' into 'master'

CustomModels/usermodel.cpp

CustomModels/usermodel.h

rocketchat.cpp

rocketchat.h

rocketchatserver.cpp

rocketchatserver.h

services/emojiservice.cpp

services/fileservice.cpp

services/messageservice.cpp

services/rocketchatchannelservice.cpp