Merge remote-tracking branch 'origin/v1.4.0' into v1.4.0

# Conflicts:
#	package.json

examples/complete/material/src/routes/Account/components/AccountForm/AccountForm.js

@@ -1,11 +1,12 @@
 import React, { PropTypes } from 'react'
+import { connect } from 'react-redux'
 import { Field, reduxForm, submit } from 'redux-form'
 import { firebaseConnect, pathToJS, isLoaded } from 'react-redux-firebase'
 import RaisedButton from 'material-ui/RaisedButton'
 import TextField from 'components/TextField'
+import { List, ListItem } from 'material-ui/List'
+import AccountCircle from 'material-ui/svg-icons/action/account-circle'
 import { ACCOUNT_FORM_NAME } from 'constants/formNames'
-import { connect } from 'react-redux'
-import ProviderDataForm from '../ProviderDataForm/ProviderDataForm'
 import classes from './AccountForm.scss'
 
 export const AccountForm = ({ account, handleSubmit, submitForm, submitting }) => (

examples/complete/material/src/routes/Account/containers/AccountContainer.js

@@ -21,14 +21,8 @@ import classes from './AccountContainer.scss'
     account: pathToJS(firebase, 'profile'),
   }),
   {
-    submitForm: () => (dispatch) => {
-      dispatch(submit(ACCOUNT_FORM_NAME));
-    },
-  }
-)
-export default class Account extends Component {
-  static contextTypes = {
-    router: React.PropTypes.object.isRequired
+    // action for submitting redux-form
+    submitForm: () => (dispatch) => dispatch(submit(ACCOUNT_FORM_NAME))
   }
 )
 export default class Account extends Component {
@@ -63,7 +57,7 @@ export default class Account extends Component {
   }
 
   render () {
-    const { account } = this.props
+    const { account, submitForm } = this.props
 
     if (!isLoaded(account)) {
       return <LoadingSpinner />
@@ -83,7 +77,7 @@ export default class Account extends Component {
             <div className={classes.meta}>
               <AccountForm
                 account={account}
-                submitForm={this.props.submitForm}
+                submitForm={submitForm}
                 onSubmit={this.updateAccount}
               />
             </div>