Merge branch 'collections' of github.com:metabase/metabase into collections

frontend/src/metabase/components/Popover.jsx

@@ -238,6 +238,6 @@ export default class Popover extends Component {
     }
 
     render() {
-        return null;
+        return <span className="hide" />;
     }
 }

frontend/src/metabase/components/Select.jsx

@@ -119,10 +119,13 @@ class BrowserSelect extends Component {
 
 export class Option extends Component {
     static propTypes = {
-        children: PropTypes.any,
-        selected: PropTypes.bool,
-        disabled: PropTypes.bool,
-        onClick: PropTypes.func
+        children:   PropTypes.any,
+        selected:   PropTypes.bool,
+        disabled:   PropTypes.bool,
+        onClick:    PropTypes.func,
+        icon:       PropTypes.string,
+        iconColor:  PropTypes.string,
+        iconSize:   PropTypes.number,
     };
 
     render() {

frontend/src/metabase/containers/SaveQuestionModal.jsx

@@ -2,7 +2,6 @@ import React, { Component, PropTypes } from "react";
 
 import ReactCSSTransitionGroup from "react-addons-css-transition-group";
 
-import Icon from "metabase/components/Icon";
 import FormField from "metabase/components/FormField.jsx";
 import ModalContent from "metabase/components/ModalContent.jsx";
 import Radio from "metabase/components/Radio.jsx";

test/metabase/api/card_test.clj

@@ -191,6 +191,7 @@
      :table_id               table-id
      :query_type             "query"
      :collection_id          nil
+     :collection             nil
      :archived               false
      :labels                 []})
   ((user->client :rasta) :get 200 (str "card/" (u/get-id card))))