[FIX] marketing_campaign: typo in manifest
[FIX] l10n_br: remove reference to old base.group_extended group

Fixes #3879
[FIX] mrp: prevent recursion from phantom boms with no lines

if the bom is phantom and has no line, we attempt to find a new bom with the default product uom
This is possible that we find the same bom that the current one
In such a case, we must not explode, to avoid recursion.
[FIX] correctly update many2many in listview (web client)

Fixes the issue #1216 (follow the link for more information). The issue
was caused by a hack in list view: the magical suffix __display is used
in render_cell to determine if a many2many field should be updated. This
commit simply makes sure that old many2many fields + __display keys are
cleared.

A better way would be to redesign/refactor the list view to avoid that
hack in the first place.  But this would be a much more complex task.
Merge remote-tracking branch 'odoo/7.0' into 7.0

Conflicts:
	addons/l10n_br/account_view.xml
	addons/mrp/mrp.py

See https://github.com/OCA/OCB/wiki/7.0-2014-11-27