OLD 8.0 2016 05 28

One line conflict between https://github.com/OCA/OCB/pull/474/files and https://github.com/odoo/odoo/commit/2164383fe49a5bc7e9b9469eb8bc79afdde3681a. Solved by taking upstream version.

--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@@ -207,7 -211,7 +211,11 @@@ class website_sale(http.Controller)
          if attrib_list:
              post['attrib'] = attrib_list
          pager = request.website.pager(url=url, total=product_count, page=page, step=PPG, scope=7, url_args=post)
++<<<<<<< HEAD
 +        product_ids = product_obj.search(cr, uid, domain, limit=PPG, offset=pager['offset'], context=context)
++=======
+         product_ids = product_obj.search(cr, uid, domain, limit=PPG, offset=pager['offset'], order=self._get_search_order(post), 
++>>>>>>> 2164383... [FIX] website_sale: allow to override product order on shop
          products = product_obj.browse(cr, uid, product_ids, context=context)
  
          style_obj = pool['product.style']

Committed as https://github.com/OCA/OCB/commit/8f43bd18d34e59fb7ebf4afba2b18ceb0fce6d77 by @Stefanrijnhart.