Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-reserve-surplus-account-remove-psi

1. trunk-reserve-surplus-account-remove-psi
2. Dependent merge proposals