[IMP] account: learn the res.partner.bank of partners in reconciliation process on bank statement + adapted l10n_be
[FIX] account: allow to cancel a bank statement if the option is set on the bank journal
[IMP] account, bank statement reconciliation: bugfixes related to the use case of clearing accounts where the type is 'other' but can be reconciled (amount_residual can now be used on these accounts)
[FIX]account reconciliation: fix pager and filter search in widget
[FIX]account reconciliation: filter take partner name into account if no partner defined
[FIX] account: bank statement creation do not confuse anymore with default name
[FIX] account: fixed the proposal of reconciliation in the bank statement for negative amounts
[IMP] account: improved demo data for bank statement reconciliation
merge upstream
[IMP] tour.js: improve log messages
Merge pull request #611 from odoo-dev/saas-3-really-fix-session-expired-fme

[MERGE]  http routing: fix handle_exception logic and _authenticate exceptions

* Better separate JsonRequest and HttpRequest handling
for exceptions, so each type of request handles exception
the right way. Previously HttpRequest would supersede
JsonRequest in some cases and generate pure HTML
responses where a JSON result was expected.
* Also ensure that ir.http._authenticate() only raises
two possible exception types, hiding any other kind
of internal errors:
 - openerp.exceptions.AccessDenied
 - openerp.http.SessionExpiredException
Merge pull request #666 from odoo-dev/master-statement-fixes-alot-qdp

evil pull request with fixes on the new bank statement reconciliation widget
Unify website slugify method behavior with or without python-slugify, and add some unit tests
Merge pull request #671 from odoo-dev/master-tour-better-log-chm

[IMP] tour.js: improve log messages
[FIX] survey: display labels in the right order in survey reporting views
Overwrite translation on module update if option is set

Launchpad bug: https://bugs.launchpad.net/ocb-server/+bug/1319285
Merge pull request #672 from odoo-dev/master-survey-fix-rim

[FIX] survey: display labels in the right order in survey reportings
[FIX] web: regenerate messed up `base.css` during commit 5087612
[MERGE] forward port of branch saas-4 up to 4be9142
[MERGE] forward port of branch saas-5 up to c9f6587