[FIX] correct context resetting when changing user lang
[IMP] website translator: allow to translate a page even when you can't edit it
Merge remote-tracking branch 'odoo/master' into master-allow-translate-on-noedit-sle
Merge pull request #848 from odoo-dev/master-fix-session-reset-sle

[FIX] correct context resetting when changing user lang
Merge pull request #861 from odoo-dev/master-allow-translate-on-noedit-sle

Master allow translate on noedit sle
[IMP] join stdout and stderr in error report when sass returncode>0
Merge pull request #864 from odoo-dev/master-sass-stdout-fme

[IMP] join stdout and stderr in error report when sass returncode>0
[IMP] test display sql query counter
Merge branch 'master' into master-apiculture