Merge proposals dependent on lp://qastaging/~openerp-dev/openobject-addons/7.0-event-training-od-xal

1. 7.0-event-training-od-xal
2. Dependent merge proposals