[MERGE] trunk

addons/portal/portal.py

addons/portal/portal_data.xml

addons/portal/portal_demo.xml

addons/portal/wizard/portal_wizard.py

addons/share/res_users.py

addons/share/share_data.xml

addons/share/wizard/share_wizard.py

addons/website/static/src/js/website.snippets.editor.js

addons/website_blog/static/description/index.html

addons/website_event_track/models/event.py

addons/website_event_track/views/website_event.xml