Merge proposals dependent on lp:~juan-munoz-clearcorp/openerp-ccorp-addons/ccorp_addons_feature2

1. ccorp_addons_feature2
2. Dependent merge proposals