update to current master

CustomModels/channelmodel.cpp

CustomModels/channelmodel.h

android/androidbadges.cpp

android/androidcheckpermissions.cpp

android/androidstatusbarcolor.cpp

api/meteorddp.h

api/restapi.cpp

api/restapi.h

container/sortedvector.cpp

container/sortedvector.h

ddpRequests/rocketchatupdatepushtokenrequest.cpp

notifications/android/androidnotificationreceiver.cpp

repos/channelrepository.cpp

repos/channelrepository.cpp.orig

repos/channelrepository.h

repos/entities/rocketchatchannel.cpp

repos/entities/rocketchatchannel.h

repos/entities/rocketchatmessage.cpp

repos/entities/rocketchatmessage.h

repos/messagerepository.cpp