Testing Conflict 5h11PM
- Testing conflict 5h14
Merge branch 'master' of https://github.com/KDVN/openerp7.git