[FIX] Travis
Merge branch '7.0' of https://github.com/grap/odoo-addons-grap into 7.0-internal-trade

Merge from Trunk/7.0