Merge branch 'server-trunk'

...ns/account_analytic_analysis/account_analytic_analysis.py

...ount_analytic_analysis/account_analytic_analysis_view.xml

addons/event/email_template.xml

addons/event/event.py

addons/event/event_view.xml

addons/mass_mailing/__openerp__.py

addons/mass_mailing/data/mass_mailing_data.xml

addons/mass_mailing/data/mass_mailing_demo.xml

.../mass_mailing/static/src/img/blocks/button_newsletter.png

...mass_mailing/static/src/js/website_mass_mailing.editor.js

addons/mass_mailing/static/src/js/website_mass_mailing.js

addons/mass_mailing/views/snippets.xml

addons/mass_mailing/views/website_mass_mailing.xml

addons/website/models/ir_ui_view.py

addons/website_forum/data/badges_moderation.xml

addons/website_mail/data/mail_groups.xml

...ite_mail/static/src/img/blocks/button_group_subscribe.png

addons/website_mail/static/src/js/website_mail.editor.js

addons/website_mail/views/snippets.xml

openerp/addons/base/ir/ir_model.py