Merge branch 'master' of github.com:Pixate/pixate-freestyle-ios

Author: Paul Colton

src/Core/Styling/Utils/PXProxy.m

@@ -83,6 +83,12 @@ - (BOOL)respondsToSelector:(SEL)aSelector
     return NO;
 }
 
+- (BOOL)conformsToProtocol:(Protocol *)aProtocol {
+    if ([self.overridingObject conformsToProtocol:aProtocol]) return YES;
+    if ([self.baseObject conformsToProtocol:aProtocol]) return YES;
+    return NO;
+}
+
 #pragma mark - hash and equality
 
 /// make sure we look like the original object