[MERGE] merge from master

diff --cc addons/account_analytic_analysis/account_analytic_analysis_view.xml
Simple merge

diff --cc addons/event/event_view.xml
Simple merge

diff --cc addons/stock/stock_view.xml
Simple merge

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/xml/base.xml
index a856381,6363f61..f3de92e
--- 1/addons/web/static/src/xml/base.xml
--- 2/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@@ -440,16 -440,14 +440,16 @@@
          </tr>
          <tr>
              <td class="oe_leftbar" valign="top">
 -                <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
 -                <a class="oe_logo" t-attf-href="/web?#{debug}">
 -                    <span class="oe_logo_edit">Edit Company data</span>
 -                    <img t-att-src='widget.session.url("/web/binary/company_logo")'/>
 -                </a>
 -                <div class="oe_secondary_menus_container"/>
 -                <div class="oe_footer">
 -                    Powered by <a href="https://www.odoo.com" target="_blank"><span>Odoo</span></a>
 +                <div>
 +                    <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
 +                    <a class="oe_logo" t-attf-href="/web?#{debug}">
 +                        <span class="oe_logo_edit">Edit Company data</span>
 +                        <img t-att-src='widget.session.url("/web/binary/company_logo")'/>
 +                    </a>
 +                    <div class="oe_secondary_menus_container"/>
 +                    <div class="oe_footer">
-                         Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
++                        Powered by <a href="http://www.odoo.com" target="_blank"><span>Odoo</span></a>
 +                    </div>
                  </div>
              </td>
              <td class="oe_application">