Merge branch 'master' into 6-add-method-for-blocking-users

config.h

ddpRequests/ddpsubscriptionrequest.cpp

engine.pro

restRequests/getserverinforequest.cpp

restRequests/getserverinforequest.h

restRequests/restpaths.cpp

restRequests/restpaths.h

rocketchatserver.cpp

rocketchatserver.h

rocketchatserverconfig.cpp

rocketchatserverconfig.h

services/messageservice.cpp