IMP code clean up
Merge branch 'master' of github.com:ingadhoc/odoo_elt into 7.0
Merge branch '7.0'