fixed conflicts from PR 402

Sources/iOS/TextField.swift

@@ -49,6 +49,11 @@ public class TextField : UITextField {
 			layer.masksToBounds = value
 		}
 	}
+    
+    /**
+     This property adds a padding to placeholder y position animation
+     */
+    public var placeholderAnimationPadding: CGFloat = 0
 	
 	/// A property that accesses the backing layer's backgroundColor.
 	@IBInspectable public override var backgroundColor: UIColor? {
@@ -227,6 +232,9 @@ public class TextField : UITextField {
 			}
 		}
 	}
+    
+    /// Vertical distance of detail label to divider
+    public var detailDistance: CGFloat = 8
 	
 	/// Vertical distance for the detailLabel from the divider.
 	@IBInspectable public var detailVerticalDistanceFromDivider: CGFloat = 8 {
@@ -624,4 +632,4 @@ public class TextField : UITextField {
 		addTarget(self, action: #selector(handleEditingDidBegin), forControlEvents: .EditingDidBegin)
 		addTarget(self, action: #selector(handleEditingDidEnd), forControlEvents: .EditingDidEnd)
 	}
-}
\ No newline at end of file
+}