diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 44345abe8e1..7320fd86e60 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -329,7 +329,7 @@ class payment_line(osv.osv):
         'date': _get_date,
     }
     _sql_constraints = [
-        ('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
+        ('name_uniq', 'UNIQUE(name, company_id)', 'The payment line name must be unique per company!'),
     ]
 
     def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index b5740c310e8..c232197cd48 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -54,7 +54,7 @@ class res_partner(osv.osv):
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
             'Opportunities', domain=[('type', '=', 'opportunity')]),
         'meeting_ids': fields.many2many('calendar.event', 'calendar_event_res_partner_rel','res_partner_id', 'calendar_event_id',
-            'Meetings'),
+            'Meetings', copy=False),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
         'opportunity_count': fields.function(_opportunity_meeting_phonecall_count, string="Opportunity", type='integer', multi='opp_meet'),
diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py
index 8a448e386f5..fa504907d95 100644
--- a/addons/hw_posbox_homepage/controllers/main.py
+++ b/addons/hw_posbox_homepage/controllers/main.py
@@ -57,9 +57,7 @@ index_template = """
         <p>
         If you need to grant remote debugging access to a developer, you can do it <a href='/remote_connect'>here</a>.
         </p>
-        <p>
-        If you need to display the current customer basket on another device, you can do it <a href='/point_of_sale/display'>here</a>.
-        </p>
+        %s
         <p>
         The PosBox software installed on this posbox is <b>version 16</b>,
         the posbox version number is independent from Odoo. You can upgrade
@@ -74,10 +72,21 @@ index_template = """
 
 
 class PosboxHomepage(openerp.addons.web.controllers.main.Home):
+
+    def get_hw_screen_message(self):
+        return """
+<p>
+    The activate the customer display feature, you will need to reinstall the PosBox software.
+    You can find the latest images on the <a href="http://nightly.odoo.com/master/posbox/">Odoo Nightly builds</a> website.
+    Make sure to download at least the version 16.<br/>
+    Odoo version 11, or above, is required to use the customer display feature.
+</p>
+"""
+
     @http.route('/', type='http', auth='none', website=True)
     def index(self):
         #return request.render('hw_posbox_homepage.index',mimetype='text/html')
-        return index_template
+        return index_template % self.get_hw_screen_message()
 
     @http.route('/wifi', type='http', auth='none', website=True)
     def wifi(self):
diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py
index ad0f47a2cda..2319a0c7c2e 100644
--- a/addons/hw_scanner/controllers/main.py
+++ b/addons/hw_scanner/controllers/main.py
@@ -120,7 +120,10 @@ class Scanner(Thread):
     def get_devices(self):
         try:
             if not evdev:
-                return None
+                return []
+
+            if not os.path.isdir(self.input_dir):
+                return []
 
             new_devices = [device for device in listdir(self.input_dir)
                            if join(self.input_dir, device) not in [dev.evdev.fn for dev in self.open_devices]]
diff --git a/addons/hw_screen/controllers/main.py b/addons/hw_screen/controllers/main.py
index aa4b8a1a729..e35c1474799 100644
--- a/addons/hw_screen/controllers/main.py
+++ b/addons/hw_screen/controllers/main.py
@@ -23,6 +23,7 @@
 from openerp import http
 from openerp.tools import config
 from openerp.addons.web.controllers import main as web
+from openerp.addons.hw_posbox_homepage.controllers import main as homepage
 
 import logging
 import netifaces as ni
@@ -35,6 +36,14 @@ self_port = str(config['xmlrpc_port'] or 8069)
 
 _logger = logging.getLogger(__name__)
 
+class Homepage(homepage.PosboxHomepage):
+
+    def get_hw_screen_message(self):
+        return """
+<p>
+If you need to display the current customer basket on another device, you can do it <a href='/point_of_sale/display'>here</a>.
+</p>
+"""
 
 class HardwareScreen(web.Home):
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 91111a52407..3a47e8d382c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1215,8 +1215,13 @@ class mrp_production(osv.osv):
         source_location_id = production.location_src_id.id
         prod_location_id = source_location_id
         prev_move= False
-        if production.bom_id.routing_id and production.bom_id.routing_id.location_id and production.bom_id.routing_id.location_id.id != source_location_id:
-            source_location_id = production.bom_id.routing_id.location_id.id
+        if production.routing_id:
+            routing = production.routing_id
+        else:
+            routing = production.bom_id.routing_id
+
+        if routing and routing.location_id and routing.location_id.id != source_location_id:
+            source_location_id = routing.location_id.id
             prev_move = True
 
         destination_location_id = production.product_id.property_stock_production.id
diff --git a/doc/cla/corporate/savoirfairelinux.md b/doc/cla/corporate/savoirfairelinux.md
index 31be8b5f9b8..784518b093e 100644
--- a/doc/cla/corporate/savoirfairelinux.md
+++ b/doc/cla/corporate/savoirfairelinux.md
@@ -1,4 +1,4 @@
-Canada, France, 8-2-2015
+Canada, France, 2017-05-12
 
 Savoir-faire Linux agrees to the terms of the Odoo Corporate Contributor License
 Agreement v1.0.
@@ -8,22 +8,25 @@ declaration.
 
 Signed,
 
-Maxime Chambreuil partners@savoirfairelinux.com https://github.com/savoirfairelinux
+Jérome Boisvert-Chouinard jerome.boisvertchouinard@savoirfairelinux.com https://github.com/jbchouinard
 
 List of contributors:
 
+Agathe Mollé agathe.molle@savoirfairelinux.com https://github.com/Ehtaga
 Bruno Joliveau bruno.joliveau@savoirfairelinux.com https://github.com/bjoliveau
-David Cormier david.cormier@savoirfairelinux.com https://github.com/cormier
 David Dufresne david.dufresne@savoirfairelinux.com https://github.com/dufresnedavid
-Davin Baragiotta davin.baragiotta@savoirfairelinux.com https://github.com/giotta
-El Hadji Dem elhadji.dem@savoirfairelinux.com https://github.com/ehdem
-Guillaume Auger guillaume.auger@savoirfairelinux.com https://github.com/jehog
+Jérome Boisvert-Chouinard jerome.boisvertchouinard@savoirfairelinux.com https://github.com/jbchouinard
 Joao Alfredo Gama Batista joao.gama@savoirfairelinux.com https://github.com/joaoalf
-Jordi Riera jordi.riera@savoirfairelinux.com https://github.com/foutoucour
-Julien Roux julien.roux@savoirfairelinux.com https://github.com/jrouxsfl
-Loïc Faure-Lacroix loic.lacroix@savoirfairelinux.com https://github.com/llacroix
-Maxime Chambreuil maxime.chambreuil@savoirfairelinux.com https://github.com/max3903
-Pierre Gault pierre.gault@savoirfairelinux.com https://github.com/gaultp
+Julie Moussu julie.mousse@savoirfairelinux.com https://github.com/JulieSFL
 Pierre Lamarche pierre.lamarche@savoirfairelinux.com https://github.com/plamarche
-Sandy Carter sandy.carter@savoirfairelinux.com https://github.com/bwrsandman
-Vincent Vinet vincent.vinet@savoirfairelinux.com https://github.com/veloutin
+David Cormier david.cormier@savoirfairelinux.com https://github.com/cormier (up to 2017-05-12)
+Davin Baragiotta davin.baragiotta@savoirfairelinux.com https://github.com/giotta (up to 2017-05-12)
+El Hadji Dem elhadji.dem@savoirfairelinux.com https://github.com/ehdem (up to 2017-05-12)
+Guillaume Auger guillaume.auger@savoirfairelinux.com https://github.com/jehog (up to 2017-05-12)
+Jordi Riera jordi.riera@savoirfairelinux.com https://github.com/foutoucour (up to 2017-05-12)
+Julien Roux julien.roux@savoirfairelinux.com https://github.com/jrouxsfl (up to 2017-05-12)
+Loïc Faure-Lacroix loic.lacroix@savoirfairelinux.com https://github.com/llacroix (up to 2017-05-12)
+Maxime Chambreuil maxime.chambreuil@savoirfairelinux.com https://github.com/max3903 (up to 2017-05-12)
+Pierre Gault pierre.gault@savoirfairelinux.com https://github.com/gaultp (up to 2017-05-12)
+Sandy Carter sandy.carter@savoirfairelinux.com https://github.com/bwrsandman (up to 2017-05-12)
+Vincent Vinet vincent.vinet@savoirfairelinux.com https://github.com/veloutin (up to 2017-05-12)
diff --git a/doc/cla/individual/JesusVMayor.md b/doc/cla/individual/JesusVMayor.md
index c009f323be9..456778e94f5 100644
--- a/doc/cla/individual/JesusVMayor.md
+++ b/doc/cla/individual/JesusVMayor.md
@@ -9,4 +9,4 @@ declaration.
 Signed,
 
 Jesús Ventosinos Mayor jesus@pexego.es https://github.com/jesusVMayor
-
+Jesús Ventosinos Mayor jesus@comunitea.com https://github.com/jesusVMayor