uptades
Merge branch 'master' of https://github.com/mohamedhagag/dvit-odoo8

Conflicts:
	invoice_discount/__openerp__.py
Merge branch 'master' of https://github.com/mohamedhagag/dvit-odoo8