Merge branch 'development' into fix/docLinks

* development:
  Update and standardize contracts README
  Add to CHANGELOG
  Refactor toBaseUnitAmount so that it throws if user supplies unitAmount with too many decimals
  Make assertion stricter so that one cannot submit invalid baseUnit amounts to `toUnitAmount`
  Add some missed underscores, update changelog and comments
  Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors

# Conflicts:
#	packages/website/ts/pages/documentation/documentation.tsx
#	packages/website/ts/pages/shared/nested_sidebar_menu.tsx

2 files changed, 6 insertions, 6 deletions

diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index 296e63f1d..c5afcb79f 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -459,26 +459,26 @@ export class FAQ extends React.Component<FAQProps, FAQState> {
                 >
                     <h1 className="center" style={{...styles.thin}}>0x FAQ</h1>
                     <div className="sm-px2 md-px2 lg-px0 pb4">
-                        {this.renderSections()}
+                        {this._renderSections()}
                     </div>
                 </div>
                 <Footer />
             </div>
         );
     }
-    private renderSections() {
+    private _renderSections() {
         const renderedSections = _.map(sections, (section: FAQSection, i: number) => {
             const isFirstSection = i === 0;
             return (
                 <div key={section.name}>
                     <h3>{section.name}</h3>
-                    {this.renderQuestions(section.questions, isFirstSection)}
+                    {this._renderQuestions(section.questions, isFirstSection)}
                 </div>
             );
         });
         return renderedSections;
     }
-    private renderQuestions(questions: FAQQuestion[], isFirstSection: boolean) {
+    private _renderQuestions(questions: FAQQuestion[], isFirstSection: boolean) {
         const renderedQuestions = _.map(questions, (question: FAQQuestion, i: number) => {
             const isFirstQuestion = i === 0;
             return (
diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx
index 534304cc8..54ae1a592 100644
--- a/packages/website/ts/pages/faq/question.tsx
+++ b/packages/website/ts/pages/faq/question.tsx
@@ -27,7 +27,7 @@ export class Question extends React.Component<QuestionProps, QuestionState> {
             >
                 <Card
                     initiallyExpanded={this.props.shouldDisplayExpanded}
-                    onExpandChange={this.onExchangeChange.bind(this)}
+                    onExpandChange={this._onExchangeChange.bind(this)}
                 >
                     <CardHeader
                         title={this.props.prompt}
@@ -45,7 +45,7 @@ export class Question extends React.Component<QuestionProps, QuestionState> {
             </div>
         );
     }
-    private onExchangeChange() {
+    private _onExchangeChange() {
         this.setState({
             isExpanded: !this.state.isExpanded,
         });