Merge pull request #234 from brandonroth/development

Fix bug where changes to the placeholderLabel are not propigated to t…

Sources/TextView.swift

@@ -560,10 +560,8 @@ public class TextView: UITextView {
 		if let v: UILabel = titleLabel {
 		if let v: UILabel = titleLabel {
 			if v.hidden {
 			if v.hidden {
 				if let s: String = placeholderLabel?.text {
 				if let s: String = placeholderLabel?.text {
-					if 0 == v.text?.utf16.count || nil == v.text {
                     v.text = s
                     v.text = s
 				}
 				}
-				}
 				let h: CGFloat = ceil(v.font.lineHeight)
 				let h: CGFloat = ceil(v.font.lineHeight)
 				v.frame = CGRectMake(0, -h, bounds.width, h)
 				v.frame = CGRectMake(0, -h, bounds.width, h)
 				v.hidden = false
 				v.hidden = false