[MERGE] lp:~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-project-aja