Merge branch 'master' into AP-7-artcity-consignment-wallet

Ok, it was my fault...

Conflicts:
	js/components/whitelabel/wallet/wallet_app.js

js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js

@@ -13,7 +13,7 @@ let Vivi23Landing = React.createClass({
     propTypes: {
         customThumbnailPlaceholder: React.PropTypes.func,
 
-        // Provided from PrizeApp
+        // Provided from WalletApp
         currentUser: React.PropTypes.object,
         whitelabel: React.PropTypes.object.isRequired,
 

js/components/whitelabel/wallet/components/polline/polline_landing.js

@@ -13,34 +13,23 @@ import { setDocumentTitle } from '../../../../../utils/dom_utils';
 
 
 let PollineLanding = React.createClass({
-    getInitialState() {
+    propTypes: {
-        return WhitelabelStore.getState();
+        // Provided from WalletApp
+        currentUser: React.PropTypes.object,
+        whitelabel: React.PropTypes.object.isRequired
     },
 
     componentWillMount() {
         setDocumentTitle('Polline Marketplace');
     },
 
-    componentDidMount() {
-        WhitelabelStore.listen(this.onChange);
-        WhitelabelActions.fetchWhitelabel();
-    },
-
-    componentWillUnmount() {
-        WhitelabelStore.unlisten(this.onChange);
-    },
-
-    onChange(state) {
-        this.setState(state);
-    },
-
     render() {
         return (
             <div className="container ascribe-form-wrapper polline-landing">
                 <div className="row">
                     <div className="col-xs-12">
                         <div className="row polline-landing--header">
-                            <img className="polline-landing--header-logo" src={this.state.whitelabel.logo} />
+                            <img className="polline-landing--header-logo" src={this.props.whitelabel.logo} />
                             <div>
                                 {getLangText('Polline Art Marketplace is powered by') + ' '}
                                 <span className="icon-ascribe-logo" />