merge master into tutorial

diff --cc src/features/app/components/Main/Main.jsx
Simple merge

diff --cc src/features/app/components/Navigation/Navigation.jsx
index 73f352a,0f5bf66..ea49af9
--- 1/src/features/app/components/Navigation/Navigation.jsx
--- 2/src/features/app/components/Navigation/Navigation.jsx
+++ b/src/features/app/components/Navigation/Navigation.jsx
@@@ -58,16 -61,10 +61,16 @@@ class Navigation extends React.Componen
              </Link>
            </li>
            }
 +          <li>
 +            <a href='#' onClick={this.openTutorial}>
 +              {navIcon('tutorial', styles)}
 +              Tutorial
 +            </a>
 +          </li>
          </ul>
  
-         <ul className={styles.navigation}>
-           <li className={styles.navigationTitle}>advanced</li>
+         { this.props.showNavAdvance && <ul className={styles.navigation}>
+           <li className={styles.navigationTitle}>{lang === 'zh' ? '高级' : 'advanced' }</li>
            <li>
              <Link to='/unspents' activeClassName={styles.active}>
                {navIcon('unspent', styles)}

diff --cc src/features/shared/components/PageTitle/PageTitle.jsx
index efdf0e3,7ea565d..61b36aa
--- 1/src/features/shared/components/PageTitle/PageTitle.jsx
--- 2/src/features/shared/components/PageTitle/PageTitle.jsx
+++ b/src/features/shared/components/PageTitle/PageTitle.jsx
@@@ -7,17 -9,22 +9,25 @@@ import makeRoutes from 'routes
  import actions from 'actions'
  import styles from './PageTitle.scss'
  import componentClassNames from 'utility/componentClassNames'
 +import classNames from 'classnames'
  
  class PageTitle extends React.Component {
+   constructor(props){
+     super(props)
+     this.state={component: null}
+   }
+ 
+   componentDidMount() {
+     this.setState({component: ReactDOM.findDOMNode(this).parentNode})
+   }
    render() {
      const chevron = require('images/chevron.png')
 +    // const className = classNames(styles.main, 'navbar', 'navbar-fixed-top')
 +    const className = classNames(styles.main)
  
      return(
-       <div className={componentClassNames(this)}>
-         <div className={className} style={{marginTop: this.props.margintop+'px'}}>
+       <div className={componentClassNames(this)} >
 -        <div className={`${styles.main} navbar navbar-fixed-top`}>
++        <div className={`${styles.main} navbar navbar-fixed-top`}  style={{marginTop: this.props.margintop+'px'}}>
            <div className={styles.navigation}>
              <ul className={styles.crumbs}>
                {this.props.breadcrumbs.map(crumb =>

diff --cc src/features/shared/components/PageTitle/PageTitle.scss
Simple merge