[FIX] dict notation for js reserved words in options (Fixes #2957)
[FIX] pos_restaurant: Issue 614981: product renaming from name to display_name was not done in the pos_restaurant module, resulting in empty product names in various places
Merge branch '8.0' of https://github.com/odoo/odoo into 8.0-win32