Merge proposals dependent on lp://staging/~school-dev-team/school-base-openerp-module/school-base-extension-v6

1. school-base-extension-v6
2. Dependent merge proposals