Merge master into typings-2.0

* Changed Files

react-tabs/index.d.ts

@@ -23,6 +23,8 @@ declare namespace ReactTabs {
 
     interface TabListProps {
         className?: string;
+        activeTabClassName?: string;
+        disabledTabClassName?: string;
     }
 
     interface TabList extends React.ComponentClass<TabListProps> {}