Merge proposals dependent on lp://staging/~pedro.baeza/openerp-web/7.0-web_calendar-fix-1306136

1. 7.0-web_calendar-fix-1306136
2. Dependent merge proposals