Merge branch 'master' into ExamplesAndBuildFix

Malliapi, Chris (UK - London)

2015-04-11 c6f8cd71b4ff0ab056d7eecd1ac086915346e1e0

Merge branch 'master' into ExamplesAndBuildFix

 src/DateTimeField.jsx

@@ -42,7 +42,7 @@
      },
      viewDate: moment(this.props.dateTime, this.props.format, true).startOf("month"),
      selectedDate: moment(this.props.dateTime, this.props.format, true),
      inputValue: typeof this.props.defaultText == 'undefined' ?  this.props.defaultText : moment(this.props.dateTime, this.props.format, true).format(this.props.inputFormat)
      inputValue: typeof this.props.defaultText != 'undefined' ?  this.props.defaultText : moment(this.props.dateTime, this.props.format, true).format(this.props.inputFormat)
    };
  },
  componentWillReceiveProps: function(nextProps) {