[MERGE] trunk
[MERGE] trunk
[IMP] attempt to correctly set the db in session when browsing /web/
[ADD] hacky abort() proxy for json requests
[MERGE] from trunk
[MERGE] upstream
[ADD] custom build of CKEditor 4.3 final
[FIX] MockRequestCase, broken when set_request was removed in server revid:fme@openerp.com-20131120192550-i9xzyqkufe3stnb3
[FIX] web_form: FieldMany2ManyBinaryMultiFiles error when rendering twice (with an onchange for e.g.)
[ADD] added serialize_exception decorator

See server's trunk-website-al revision #5085
[MERGE] sync with trunk (to rev 3893)
[IMP] css small change for bootstrap
[MERGE] trunk
[MERGE] from trunk
[FIX]Issue of trunk in website branch.
[IMP] update ckeditor to 4.3.1
[IMP] webclient entry point controller
[ADD] Client.client_options
[FIX] webclient reference
[IMP] Database selector and manager