Merge branch 'develop' into feature/delegate_object

# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift

MVMCoreUI/Atoms/Views/Label.swift

@@ -290,30 +290,9 @@ import MVMCore
     
     @objc public func setAsMolecule() {
         
-        originalAttributedString = attributedText
-        setupView()
     }
     
     @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
         Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData)
-        
-        //        guard let dictionary = json else { return }
-        
-        /*
-         if let numberOfLinesCount = dictionary["numberOfLines"] as? Int {
-         numberOfLines = numberOfLinesCount
-         }
-         
-         if let lineBreakModeValue = dictionary["lineBreakMode"] as? Int, let brakMode = NSLineBreakMode(rawValue: lineBreakModeValue) {
-         lineBreakMode = brakMode
-         }
-         
-         0 byWordWrapping // Wrap at word boundaries, default
-         1 byCharWrapping // Wrap at character boundaries
-         2 byClipping // Simply clip
-         3 byTruncatingHead // Truncate at head of line: "...wxyz"
-         4 byTruncatingTail // Truncate at tail of line: "abcd..."
-         5 byTruncatingMiddle // Truncate middle of line:  "ab...yz"
-         */
     }
 }