Merge proposals dependent on lp://qastaging/~ernesto-gm/openerp-mexico-localization/openacademy_dev_wicho

1. openacademy_dev_wicho
2. Dependent merge proposals