[MERGE] merge bzr saas-4 addons branch

addons/account/account.py

...ns/account_analytic_analysis/account_analytic_analysis.py

addons/auth_oauth/auth_oauth_data.xml

addons/crm/wizard/crm_lead_to_opportunity.py

addons/gamification/models/challenge.py

addons/gamification/models/goal.py

addons/mail/mail_followers.py

addons/mail/mail_mail.py

addons/mail/mail_thread.py

addons/marketing_campaign/marketing_campaign.py

addons/point_of_sale/point_of_sale.py

addons/point_of_sale/static/src/js/db.js

addons/point_of_sale/static/src/js/models.js

addons/survey/controllers/main.py

addons/website/controllers/main.py

addons/website/models/website.py

addons/website/static/src/css/website.css

addons/website/views/website_templates.xml

addons/website_blog/controllers/main.py

addons/website_crm_partner_assign/controllers/main.py