Merge branch 'maint-1.0'

• maint-1.0: BibFormat: fix regression test WebJournal: fix seminar widget for new Indico APIs urlutils: new Indico request generator helper WebJournal: update weather widget for new APIs BibFormat: better escape BFE in admin test UI BibFormat: fix URL to ejournal resolver BibFormat: use default namespace in XSL BibHarvest: check for empty resumptionToken BibFormat: fix XSLT formatting of MARCXML snippets WebSearch: fix CDSIndico external search WebSubmit: check_user_can_view_record in publiline WebSubmit: fix filename bug in document manager BibHarvest: fix MARCXML creation in OAI updater installation: fix issue with FCKeditor BibHarvest: fix MARCXML creation in OAI updater WebComment: fix washing of email to admin WebJournal: fix seminar widget encoding issue htmlutils: fix FCKeditor upload URLs mailutils: remove unnecessary 'multipart/related' BibRank: fix empty citation data cacher

Conflicts:
Makefile.am
modules/bibformat/lib/bibformat.py
modules/bibformat/lib/bibformat_engine.py
modules/bibharvest/lib/oai_repository_regression_tests.py
modules/bibharvest/lib/oai_repository_server.py
modules/bibharvest/lib/oai_repository_tests.py
modules/bibharvest/lib/oai_repository_updater.py
modules/miscutil/lib/htmlutils.py
modules/webcomment/lib/webcomment.py
modules/websubmit/web/publiline.py