updated ControlView intrinsicContentSize and minor cleanups

Sources/iOS/ControlView.swift

@@ -218,7 +218,7 @@ public class ControlView : MaterialView {
 	}
 	}
 	
 	
 	public override func intrinsicContentSize() -> CGSize {
 	public override func intrinsicContentSize() -> CGSize {
-		return CGSizeMake(width, 44)
+		return CGSizeMake(superview?.bounds.width ?? MaterialDevice.width, 44)
 	}
 	}
 	
 	
 	/**
 	/**

Sources/iOS/Material+UIImage+Resize.swift

@@ -45,7 +45,7 @@ public extension UIImage {
 		}
 		}
 		
 		
 		let g: UIImage?
 		let g: UIImage?
-		let t: CGRect = CGRectMake(0, 0, nil == w ? tw : w!, nil == h ? th : h!)
+		let t: CGRect = CGRectMake(0, 0, w ?? tw, h ?? th)
 		UIGraphicsBeginImageContextWithOptions(t.size, false, MaterialDevice.scale)
 		UIGraphicsBeginImageContextWithOptions(t.size, false, MaterialDevice.scale)
 		drawInRect(t, blendMode: .Normal, alpha: 1)
 		drawInRect(t, blendMode: .Normal, alpha: 1)
 		g = UIGraphicsGetImageFromCurrentImageContext()
 		g = UIGraphicsGetImageFromCurrentImageContext()