Merge branch 'master' into 'staging_hisworklist'

# Conflicts:
#   .gitlab-ci.yml
#   docker-compose.yml
#   imports/api/collections/worklist4hislink.js

imports/api/collections/worklist4hislink.js

@@ -30,6 +30,8 @@ if (Meteor.isClient || Meteor.isCordova) {
             collections[collName] = new Mongo.Collection(collName);
         }
     });
+
+
 }
 
 export default collections;
\ No newline at end of file