[FIX] bunch of changes lost in incorrect merge f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72

diff --cc addons/account_analytic_analysis/account_analytic_analysis.py
Simple merge

diff --cc addons/account_analytic_analysis/account_analytic_analysis_view.xml
Simple merge

diff --cc addons/website/models/ir_ui_view.py
Simple merge

diff --cc addons/website_mail_group/static/src/js/website_mail_group.editor.js
index 7a26920,0000000..fdfb948
mode 100644,000000..100644
--- 1/addons/website_mail_group/static/src/js/website_mail_group.editor.js
--- /dev/null
+++ b/addons/website_mail_group/static/src/js/website_mail_group.editor.js
@@@ -1,40 -1,0 +1,40 @@@
 +(function () {
 +    'use strict';
 +
 +    var website = openerp.website;
 +    var _t = openerp._t;
 +
 +    website.snippet.options.subscribe = website.snippet.Option.extend({
 +        on_prompt: function () {
 +            var self = this;
 +            return website.prompt({
 +                id: "editor_new_subscribe_button",
 +                window_title: _t("Add a Subscribe Button"),
-                 select: _t("Mailing List"),
++                select: _t("Discussion List"),
 +                init: function (field) {
 +                    return website.session.model('mail.group')
 +                            .call('name_search', ['', [['public','=','public']]], { context: website.get_context() });
 +                },
 +            }).then(function (mail_group_id) {
 +                self.$target.attr("data-id", mail_group_id);
 +            });
 +        },
 +        drop_and_build_snippet: function() {
 +            var self = this;
 +            this._super();
 +            this.on_prompt().fail(function () {
 +                self.editor.on_remove();
 +            });
 +        },
 +        start : function () {
 +            var self = this;
 +            this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
 +            this._super();
 +        },
 +        clean_for_save: function () {
 +            this.$target.addClass("hidden");
 +        },
 +    });
 +})();
 +
 +