Merge proposals dependent on lp:~openerp-dev/openerp-web/7.0-fix-many2many_binary-reload-chm

1. 7.0-fix-many2many_binary-reload-chm
2. Dependent merge proposals