Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2

AppKit/Themes/Aristo2/ThemeDescriptors.j

@@ -1715,7 +1715,7 @@ var themedButtonValues = nil,
             [@"inner-shadow-offset", CPSizeMakeZero()],
             [@"inner-shadow-color", [CPColor blackColor]],
             [@"inner-shadow-size", 6.0],
-            [@"content-margin", CPSizeMake(10.0, 10.0)]
+            [@"content-margin", CPSizeMakeZero()]
         ];
 
     [self registerThemeValues:themeValues forView:box];

Tools/nib2cib/NSMenuItem.j

@@ -22,6 +22,7 @@
 
 @import <AppKit/CPMenuItem.j>
 
+@import "NSButton.j"
 @import "NSEvent.j"
 @import "NSMenu.j"