Merge branch 'feature/serverChoice2' into 'master'

CustomModels/channelmodel.cpp

CustomModels/channelmodel.h

api/meteorddp.cpp

api/meteorddp.h

api/restapi.cpp

api/restapi.h

engine.pro

rocketchat.cpp

rocketchat.h

rocketchatserver.cpp

rocketchatserver.h

websocket/linuxwebsocket/websocketlinux.cpp

websocket/linuxwebsocket/websocketlinux.h

websocket/websocket.cpp

websocket/websocket.h

websocket/websocketabstract.cpp

websocket/websocketabstract.h