Updated to work with odoo repo branch 8.0
Merge remote-tracking branch 'origin/trunk' into trunk

Conflicts:
	README.md