diff --git a/MANIFEST.in b/MANIFEST.in
index 034e06807ff..2ef37c2bb2e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -23,4 +23,5 @@ recursive-include openerp *.woff
 recursive-include openerp *.xsl
 recursive-include openerp *.xml
 recursive-include openerp *.yml
-recursive-exclude * *.py[co]
\ No newline at end of file
+recursive-exclude * *.py[co]
+recursive-exclude * *.hg*
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 766db9e1a99..938e5e67127 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -54,7 +54,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/account/static/src/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
     
diff --git a/addons/account/static/src/img/btn_paynowcc_lg.gif b/addons/account/static/src/img/btn_paynowcc_lg.gif
new file mode 100644
index 00000000000..092c5542551
Binary files /dev/null and b/addons/account/static/src/img/btn_paynowcc_lg.gif differ
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/fr_BE.po b/addons/account_asset/i18n/fr_BE.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
old mode 100755
new mode 100644
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
old mode 100755
new mode 100644
diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index 8a55172cd85..fc13d0feb9f 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -160,7 +160,7 @@
                 <small class="col-xs-3" style="float: left; padding-right: 0px; padding-left: 0px;">sponsored by</small>
                 <div class="col-xs-2" style="padding-right: 0px; padding-left: 0px;">
                 <span>
-                    <img class="img img-responsive" src="https://www.odoo.com/openerp_website/static/src/img/logo_white.png"/>
+                    <img class="img img-responsive" src="/base/static/img/logo_white.png"/>
                 </span>
                 </div>
             </div>
diff --git a/addons/im_chat/static/src/img/button-gloss.png b/addons/im_chat/static/src/img/button-gloss.png
old mode 100755
new mode 100644
diff --git a/addons/im_chat/static/src/img/glyphicons-halflings-white.png b/addons/im_chat/static/src/img/glyphicons-halflings-white.png
old mode 100755
new mode 100644
diff --git a/addons/im_chat/static/src/img/glyphicons-halflings.png b/addons/im_chat/static/src/img/glyphicons-halflings.png
old mode 100755
new mode 100644
diff --git a/addons/l10n_ae/static/description/icon.png b/addons/l10n_ae/static/description/icon.png
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/__init__.py b/addons/l10n_do/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/__openerp__.py b/addons/l10n_do/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account.account.template.csv b/addons/l10n_do/data/account.account.template.csv
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account.account.type.csv b/addons/l10n_do/data/account.account.type.csv
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account.fiscal.position.tax.template.csv b/addons/l10n_do/data/account.fiscal.position.tax.template.csv
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account.fiscal.position.template.csv b/addons/l10n_do/data/account.fiscal.position.template.csv
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account.tax.code.template.csv b/addons/l10n_do/data/account.tax.code.template.csv
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account.tax.template.csv b/addons/l10n_do/data/account.tax.template.csv
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account_chart_template.xml b/addons/l10n_do/data/account_chart_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/account_journal.xml b/addons/l10n_do/data/account_journal.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/ir_sequence.xml b/addons/l10n_do/data/ir_sequence.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/ir_sequence_type.xml b/addons/l10n_do/data/ir_sequence_type.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/l10n_do_base_data.xml b/addons/l10n_do/data/l10n_do_base_data.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/data/l10n_do_wizard.xml b/addons/l10n_do/data/l10n_do_wizard.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_do/static/description/icon.png b/addons/l10n_do/static/description/icon.png
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/account_tax.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_pl/account_tax_code.xml b/addons/l10n_pl/account_tax_code.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_pl/country_pl.xml b/addons/l10n_pl/country_pl.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_pl/fiscal_position.xml b/addons/l10n_pl/fiscal_position.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/__init__.py b/addons/l10n_ro/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/account_chart_template.xml b/addons/l10n_ro/account_chart_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/account_tax_code_template.xml b/addons/l10n_ro/account_tax_code_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/account_tax_template.xml b/addons/l10n_ro/account_tax_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/fiscal_position_template.xml b/addons/l10n_ro/fiscal_position_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_sg/static/description/icon.png b/addons/l10n_sg/static/description/icon.png
old mode 100755
new mode 100644
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_vn/static/description/icon.png b/addons/l10n_vn/static/description/icon.png
old mode 100755
new mode 100644
diff --git a/addons/mrp/static/description/ebook-manufacturing.png b/addons/mrp/static/description/ebook-manufacturing.png
new file mode 100644
index 00000000000..ab8a42c3ef8
Binary files /dev/null and b/addons/mrp/static/description/ebook-manufacturing.png differ
diff --git a/addons/mrp/static/description/index.html b/addons/mrp/static/description/index.html
index 997aa5538ec..23be339473f 100644
--- a/addons/mrp/static/description/index.html
+++ b/addons/mrp/static/description/index.html
@@ -98,7 +98,7 @@ meets your delivery schedule dates.
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+        <img src="/mrp/static/description/ebook-manufacturing.png">
     </div>
     <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>
diff --git a/addons/point_of_sale/static/description/ebook-manufacturing.png b/addons/point_of_sale/static/description/ebook-manufacturing.png
new file mode 100644
index 00000000000..ab8a42c3ef8
Binary files /dev/null and b/addons/point_of_sale/static/description/ebook-manufacturing.png differ
diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html
index 0460ef8935d..2dc99af7f4d 100644
--- a/addons/point_of_sale/static/description/index.html
+++ b/addons/point_of_sale/static/description/index.html
@@ -88,7 +88,7 @@
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+        <img src="/point_of_sale/static/description/ebook-manufacturing.png">
     </div>
     <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eot b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.eot
old mode 100755
new mode 100644
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.svg
old mode 100755
new mode 100644
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.ttf
old mode 100755
new mode 100644
diff --git a/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woff b/addons/point_of_sale/static/src/fonts/font-awesome-4.0.3/fonts/fontawesome-webfont.woff
old mode 100755
new mode 100644
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 9deab37d07b..cd1bce6c4fc 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -51,7 +51,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 
@@ -138,7 +138,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
     
diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml
index d7c24dc97fe..87c2607332d 100644
--- a/addons/product_email_template/data/product_demo.xml
+++ b/addons/product_email_template/data/product_demo.xml
@@ -34,7 +34,7 @@
         <table>
             <tr>
                 <td>
-                    <img src="https://www.openerp.com/saas_master/static/site_new/img/layout/online_training.png"/>
+                    <img src="/product_email_template/static/img/online_training.png"/>
                 </td>
                 <td style="height: auto;margin-top:10px;margin-bottom:10px;font-size:18px;color: #646464;">
                     <strong>There are three components to the training</strong>
diff --git a/addons/product_email_template/static/img/online_training.png b/addons/product_email_template/static/img/online_training.png
new file mode 100644
index 00000000000..cc03d0d7c35
Binary files /dev/null and b/addons/product_email_template/static/img/online_training.png differ
diff --git a/addons/purchase/static/description/ebook-logistic.png b/addons/purchase/static/description/ebook-logistic.png
new file mode 100644
index 00000000000..849b711bf70
Binary files /dev/null and b/addons/purchase/static/description/ebook-logistic.png differ
diff --git a/addons/purchase/static/description/index.html b/addons/purchase/static/description/index.html
index c165adf5e0c..92dbca8cf4f 100644
--- a/addons/purchase/static/description/index.html
+++ b/addons/purchase/static/description/index.html
@@ -57,7 +57,7 @@ Launch purchase tenders, integrate supplier's answers in the process and compare
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/logistic.png">
+        <img src="/purchase/static/description/ebook-logistic.png">
     </div>
     <a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index d17443a7577..708329ed2dd 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -55,7 +55,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 
diff --git a/addons/sale/static/description/ebook-marketing.png b/addons/sale/static/description/ebook-marketing.png
new file mode 100644
index 00000000000..1a046d6ce80
Binary files /dev/null and b/addons/sale/static/description/ebook-marketing.png differ
diff --git a/addons/sale/static/description/index.html b/addons/sale/static/description/index.html
index ddcde0ef085..37b448c8f66 100644
--- a/addons/sale/static/description/index.html
+++ b/addons/sale/static/description/index.html
@@ -68,7 +68,7 @@ Spend the extra time focusing on selling, not recording data.
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/marketing.png">
+        <img src="/sale/static/description/ebook-marketing.png">
     </div>
     <a href="http://www.openerp.com/ebooks/marketing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>
diff --git a/addons/sale/static/img/btn_paynowcc_lg.gif b/addons/sale/static/img/btn_paynowcc_lg.gif
new file mode 100644
index 00000000000..092c5542551
Binary files /dev/null and b/addons/sale/static/img/btn_paynowcc_lg.gif differ
diff --git a/addons/web/doc/_themes/flask_small/layout.html b/addons/web/doc/_themes/flask_small/layout.html
index aa1716aaff0..c5c44efe357 100644
--- a/addons/web/doc/_themes/flask_small/layout.html
+++ b/addons/web/doc/_themes/flask_small/layout.html
@@ -15,7 +15,7 @@
 {% block relbar2 %}
   {% if theme_github_fork %}
     <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
-    src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+    src="static/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
   {% endif %}
 {% endblock %}
 {% block sidebar1 %}{% endblock %}
diff --git a/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png b/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png
new file mode 100644
index 00000000000..146ef8a8006
Binary files /dev/null and b/addons/web/doc/_themes/flask_small/static/forkme_right_darkblue_121621.png differ
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.eot
old mode 100755
new mode 100644
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.svg
old mode 100755
new mode 100644
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.ttf
old mode 100755
new mode 100644
diff --git a/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff b/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
old mode 100755
new mode 100644
diff --git a/addons/web/static/lib/qweb/qweb-test.js.html b/addons/web/static/lib/qweb/qweb-test.js.html
index aac579d04fe..59f82d150ae 100644
--- a/addons/web/static/lib/qweb/qweb-test.js.html
+++ b/addons/web/static/lib/qweb/qweb-test.js.html
@@ -1,9 +1,9 @@
 <!doctype html>
 <html>
 <head>
-    <script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
-    <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.15.0.css" type="text/css" media="screen"/>
-    <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.15.0.js"></script>
+    <script src="/web/static/lib/jquery/jquery.js"></script>
+    <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css" type="text/css" media="screen"/>
+    <script type="text/javascript" src="/web/static/lib/qunit/qunit.js"></script>
 
     <script type="text/javascript" src="qweb2.js"></script>
 
diff --git a/addons/web/static/src/font/entypo-webfont.eot b/addons/web/static/src/font/entypo-webfont.eot
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/entypo-webfont.ttf b/addons/web/static/src/font/entypo-webfont.ttf
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/entypo-webfont.woff b/addons/web/static/src/font/entypo-webfont.woff
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.eot b/addons/web/static/src/font/mnmliconsv21-webfont.eot
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.ttf b/addons/web/static/src/font/mnmliconsv21-webfont.ttf
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.woff b/addons/web/static/src/font/mnmliconsv21-webfont.woff
old mode 100755
new mode 100644
diff --git a/addons/web/static/src/img/k-waiting1.gif b/addons/web/static/src/img/k-waiting1.gif
new file mode 100644
index 00000000000..b76cdfaac23
Binary files /dev/null and b/addons/web/static/src/img/k-waiting1.gif differ
diff --git a/addons/web/static/src/img/k-waiting2.gif b/addons/web/static/src/img/k-waiting2.gif
new file mode 100644
index 00000000000..b0b79e80830
Binary files /dev/null and b/addons/web/static/src/img/k-waiting2.gif differ
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0557dad2670..b18debb1d96 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1221,7 +1221,7 @@ instance.web.WebClient = instance.web.Client.extend({
         $("body").css("background-image", "url(" + instance.session.origin + "/web/static/src/img/back-enable.jpg" + ")");
         if ($.blockUI) {
             var imgkit = Math.floor(Math.random() * 2 + 1);
-            $.blockUI.defaults.message = '<img src="http://www.amigrave.com/loading-kitten/' + imgkit + '.gif" class="loading-kitten">';
+            $.blockUI.defaults.message = '<img src="/web/static/src/img/k-waiting' + imgkit + '.gif" class="loading-kitten">';
         }
     },
     /**
diff --git a/addons/website/static/src/img/bootswatch/amelia_thumbnail.png b/addons/website/static/src/img/bootswatch/amelia_thumbnail.png
new file mode 100644
index 00000000000..4392158ed4e
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/amelia_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch_default_thumbnail.png b/addons/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png
similarity index 100%
rename from addons/website/static/src/img/bootswatch_default_thumbnail.png
rename to addons/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png
diff --git a/addons/website/static/src/img/bootswatch/cerulean_thumbnail.png b/addons/website/static/src/img/bootswatch/cerulean_thumbnail.png
new file mode 100644
index 00000000000..f7ef994edaa
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/cerulean_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/cosmo_thumbnail.png b/addons/website/static/src/img/bootswatch/cosmo_thumbnail.png
new file mode 100644
index 00000000000..06915f439a2
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/cosmo_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/cyborg_thumbnail.png b/addons/website/static/src/img/bootswatch/cyborg_thumbnail.png
new file mode 100644
index 00000000000..cd89625b769
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/cyborg_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/flatly_thumbnail.png b/addons/website/static/src/img/bootswatch/flatly_thumbnail.png
new file mode 100644
index 00000000000..2c64a0db380
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/flatly_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/journal_thumbnail.png b/addons/website/static/src/img/bootswatch/journal_thumbnail.png
new file mode 100644
index 00000000000..530ad3bdc4b
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/journal_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/readable_thumbnail.png b/addons/website/static/src/img/bootswatch/readable_thumbnail.png
new file mode 100644
index 00000000000..24a6d9f7be0
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/readable_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/simplex_thumbnail.png b/addons/website/static/src/img/bootswatch/simplex_thumbnail.png
new file mode 100644
index 00000000000..754e8c54018
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/simplex_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/slate_thumbnail.png b/addons/website/static/src/img/bootswatch/slate_thumbnail.png
new file mode 100644
index 00000000000..b6cc60893d7
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/slate_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/spacelab_thumbnail.png b/addons/website/static/src/img/bootswatch/spacelab_thumbnail.png
new file mode 100644
index 00000000000..cba6be2e9a1
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/spacelab_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/united_thumbnail.png b/addons/website/static/src/img/bootswatch/united_thumbnail.png
new file mode 100644
index 00000000000..9e0ebac8af5
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/united_thumbnail.png differ
diff --git a/addons/website/static/src/img/bootswatch/yeti_thumbnail.png b/addons/website/static/src/img/bootswatch/yeti_thumbnail.png
new file mode 100644
index 00000000000..97bb7bad8d1
Binary files /dev/null and b/addons/website/static/src/img/bootswatch/yeti_thumbnail.png differ
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index bfa0bd2e4b5..a62074dd08a 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -26,7 +26,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img src="/website/static/src/img/bootswatch_default_thumbnail.png" class="img-responsive" alt="Default Theme"/>
+                    <img src="/website/static/src/img/bootswatch/bootswatch_default_thumbnail.png" class="img-responsive" alt="Default Theme"/>
                   </div>
                   <div class="options">
                     <h3>Default</h3>
@@ -39,7 +39,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/amelia/thumbnail.png" alt="Amelia"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/amelia_thumbnail.png" alt="Amelia"/>
                   </div>
                   <div class="options">
                     <h3>Amelia</h3>
@@ -52,7 +52,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/cerulean/thumbnail.png" alt="Cerulean"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/cerulean_thumbnail.png" alt="Cerulean"/>
                   </div>
                   <div class="options">
                     <h3>Cerulean</h3>
@@ -65,7 +65,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/cosmo/thumbnail.png" alt="Cosmo"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/cosmo_thumbnail.png" alt="Cosmo"/>
                   </div>
                   <div class="options">
                     <h3>Cosmo</h3>
@@ -78,7 +78,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/cyborg/thumbnail.png" alt="Cyborg"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/cyborg_thumbnail.png" alt="Cyborg"/>
                   </div>
                   <div class="options">
                     <h3>Cyborg</h3>
@@ -91,7 +91,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/flatly/thumbnail.png" alt="Flatly"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/flatly_thumbnail.png" alt="Flatly"/>
                   </div>
                   <div class="options">
                     <h3>Flatly</h3>
@@ -104,7 +104,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/journal/thumbnail.png" alt="Journal"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/journal_thumbnail.png" alt="Journal"/>
                   </div>
                   <div class="options">
                     <h3>Journal</h3>
@@ -117,7 +117,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/readable/thumbnail.png" alt="Readable"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/readable_thumbnail.png" alt="Readable"/>
                   </div>
                   <div class="options">
                     <h3>Readable</h3>
@@ -130,7 +130,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/simplex/thumbnail.png" alt="Simplex"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/simplex_thumbnail.png" alt="Simplex"/>
                   </div>
                   <div class="options">
                     <h3>Simplex</h3>
@@ -143,7 +143,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/slate/thumbnail.png" alt="Slate"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/slate_thumbnail.png" alt="Slate"/>
                   </div>
                   <div class="options">
                     <h3>Slate</h3>
@@ -156,7 +156,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/spacelab/thumbnail.png" alt="Spacelab"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/spacelab_thumbnail.png" alt="Spacelab"/>
                   </div>
                   <div class="options">
                     <h3>Spacelab</h3>
@@ -169,7 +169,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/united/thumbnail.png" alt="United"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/united_thumbnail.png" alt="United"/>
                   </div>
                   <div class="options">
                     <h3>United</h3>
@@ -182,7 +182,7 @@
               <div class="col-md-4">
                 <div class="well text-center">
                   <div class="image">
-                    <img class="img-responsive" src="http://bootswatch.com/yeti/thumbnail.png" alt="Yeti"/>
+                    <img class="img-responsive" src="/website/static/src/img/bootswatch/yeti_thumbnail.png" alt="Yeti"/>
                   </div>
                   <div class="options">
                     <h3>Yeti</h3>
diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml
index 4ba4e4eeeb2..838d8d5a1ce 100644
--- a/addons/website_blog/data/website_blog_demo.xml
+++ b/addons/website_blog/data/website_blog_demo.xml
@@ -23,7 +23,6 @@
             <field name="background_image">/website_blog/static/src/img/post1.jpg</field>
             <field name="content"><![CDATA[
         <section class="mt16 mb16 readable">
-            <iframe width="361" height="200" src="http://www.youtube.com/embed/EkbBFmIWoTE" frameborder="0" allowfullscreen></iframe>
             <p>
                 Emails are broken.
             </p><p>
diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml
index 86b831d6449..384b092e118 100644
--- a/addons/website_quote/data/website_quotation_data.xml
+++ b/addons/website_quote/data/website_quotation_data.xml
@@ -38,7 +38,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 
@@ -135,7 +135,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 
diff --git a/addons/website_quote/data/website_quotation_demo.xml b/addons/website_quote/data/website_quotation_demo.xml
index cdc0e589fa9..02f01a36776 100644
--- a/addons/website_quote/data/website_quotation_demo.xml
+++ b/addons/website_quote/data/website_quotation_demo.xml
@@ -275,7 +275,7 @@
                             <h2>Structure of the Training</h2>
                         </div>
                         <div class="col-md-5 col-md-offset-1 mt16 mb16">
-                            <img class="img img-responsive" src="https://www.openerp.com/saas_master/static/site_new/img/layout/online_training.png"/>
+                            <img class="img img-responsive" src="/website_quote/static/src/img/online_training.png"/>
                         </div>
                         <div class="col-md-6 mt32">
                             <h4><strong>There are three components to the training</strong></h4>
diff --git a/addons/website_quote/static/src/img/online_training.png b/addons/website_quote/static/src/img/online_training.png
new file mode 100644
index 00000000000..cc03d0d7c35
Binary files /dev/null and b/addons/website_quote/static/src/img/online_training.png differ
diff --git a/debian/control b/debian/control
index 0ec394a6377..f6982ecc396 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: odoo
 Section: net
 Priority: optional
 Maintainer: Odoo S.A. <info@odoo.com>
+Uploaders: Aaron Bohy <aab@odoo.com>, Simon Lejeune <sle@odoo.com>
 Build-Depends: debhelper (>= 9.0), python, rsync
+X-Python-Version: 2.7
 Standards-Version: 3.9.5.0
 Homepage: http://www.odoo.com/
 Vcs-Git: https://github.com/odoo/odoo
 
 Package: odoo
-Section: net
 Architecture: all
 Depends:
  ${misc:Depends},
diff --git a/debian/copyright b/debian/copyright
index 0866450aa9a..2fb0ad4b115 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Odoo <info@odoo.com>
-Upstream-Homepage: http://www.odoo.com/
-Maintainer-Contact: Debian Odoo Maintainers <gnunet@lists.debian-maintainers.org>
-Maintainer-Homepage: http://www.odoo.com/
 
 Files: *
-Copyright: (C) 2004-2014 OpenERP SA. (www.openerp.com)
+Copyright: (C) 2004-2015 Odoo SA. (www.odoo.com)
 License: AGPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as published by
diff --git a/debian/init b/debian/init
index ee4c0120db5..2a3a165dbee 100644
--- a/debian/init
+++ b/debian/init
@@ -1,18 +1,20 @@
 #!/bin/bash
 ### BEGIN INIT INFO
-# Provides:          openerp-server
+# Provides:          odoo.py
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Start openerp daemon at boot time
+# Short-Description: Start odoo daemon at boot time
 # Description:       Enable service provided by daemon.
 # X-Interactive:     true
 ### END INIT INFO
 ## more info: http://wiki.debian.org/LSBInitScripts
 
+. /lib/lsb/init-functions
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
-DAEMON=/usr/bin/openerp-server
+DAEMON=/usr/bin/odoo.py
 NAME=odoo
 DESC=odoo
 CONFIG=/etc/odoo/openerp-server.conf
diff --git a/openerp/addons/base/static/img/logo_white.png b/openerp/addons/base/static/img/logo_white.png
new file mode 100644
index 00000000000..84335cbf5cc
Binary files /dev/null and b/openerp/addons/base/static/img/logo_white.png differ
diff --git a/setup/package.py b/setup/package.py
index ce0db21bcf9..9ca97d19dd9 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -50,6 +50,9 @@ PUBLISH_DIRS = {
     'tarball': 'src',
     'windows': 'exe',
 }
+ADDONS_NOT_TO_PUBLISH = [
+    'web_analytics'
+]
 
 def mkdir(d):
     if not os.path.isdir(d):
@@ -238,11 +241,14 @@ class KVMWinTestExe(KVM):
 #----------------------------------------------------------
 # Stage: building
 #----------------------------------------------------------
-def _prepare_build_dir(o):
+def _prepare_build_dir(o, win32=False):
     cmd = ['rsync', '-a', '--exclude', '.git', '--exclude', '*.pyc', '--exclude', '*.pyo']
+    if not win32:
+        cmd += ['--exclude', 'setup/win32']
     system(cmd + ['%s/' % o.odoo_dir, o.build_dir])
     for i in glob(join(o.build_dir, 'addons/*')):
-        shutil.move(i, join(o.build_dir, 'openerp/addons'))
+        if i.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
+            shutil.move(i, join(o.build_dir, 'openerp/addons'))
 
 def build_tgz(o):
     system(['python2', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir)
@@ -454,6 +460,7 @@ def main():
             except Exception, e:
                 print("Won't publish the rpm release.\n Exception: %s" % str(e))
         if not o.no_windows:
+            _prepare_build_dir(o, win32=True)
             build_exe(o)
             try:
                 if not o.no_testing: