Revert "Merge branch 'master' of github.com:odoo/odoo-extra into 8.0-vauxoo"

This reverts commit 4c784ed4100d8e4ab7b177b38d10a609be8c005b, reversing
changes made to d695e8f31b1ea48c9689c78c461e98206f53544d.