conflict
Merge branch 'master' of https://github.com/facascante/zend-erp
product and customer