- Testing
Merge branch 'master' of https://github.com/KDVN/odoo-addons.git

Conflicts:
	.project
Merge branch 'master' of https://github.com/KDVN/odoo-addons.git
- Testing