Merge pull request #2300 from odoo-dev/master-website-multi-sig

addons/website/controllers/main.py

addons/website/data/data.xml

addons/website/data/demo.xml

addons/website/models/ir_http.py

addons/website/models/ir_ui_view.py

addons/website/models/website.py

addons/website/views/res_config.xml

addons/website/views/website_views.xml

addons/website_blog/data/website_blog_data.xml

addons/website_event/controllers/main.py

openerp/addons/base/ir/ir_ui_view.py

openerp/tools/convert.py