Merge branch 'develop' into feature/release_sp3_finish_collaboration

# Conflicts:
#	public_new/js/share.js

public_new/js/chat-websocket.js

@@ -193,13 +193,13 @@ function setSocketAction () {
         } catch(e) {
             message.text = message.text
         }
-        let messageType;
+        let type;
         let collaborationType;
         if ( message.text.includes(messageSeperator) ) {
             let text = message.text.split(messageSeperator);
             message.text = text[0];
-            messageType = text[1];
-            if (messageType == messageType.COMMUNICATIONSTART || messageType == messageType.COMMUNICATIONEND) {
+            type = text[1];
+            if (type == messageType.COMMUNICATIONSTART || type == messageType.COMMUNICATIONEND) {
                 collaborationType = text[2];
                 var userInCollaboration;
                 if (CHAT_UTIL.isIOS()) {