Merge branch 'master' into next

Conflicts:
	.gitignore
	INSTALL
	config/invenio.conf
	invenio/ext/legacy/handler.py
	invenio/legacy/bibdocfile/api.py
	invenio/legacy/bibdocfile/managedocfiles.py
	invenio/legacy/bibdocfile/plugins/bom_textdoc.py
	invenio/legacy/bibdocfile/webinterface.py
	invenio/legacy/bibexport/googlescholar.py
	invenio/legacy/bibexport/sitemap.py
	invenio/legacy/bibindex/adminlib.py
	invenio/legacy/bibindex/engine.py
	invenio/legacy/bibrank/citation_indexer.py
	invenio/legacy/bibrank/citation_searcher.py
	invenio/legacy/bibrank/selfcites_task.py
	invenio/legacy/bibrecord/__init__.py
	invenio/legacy/bibupload/engine.py
	invenio/legacy/inveniocfg.py
	invenio/legacy/miscutil/sql/tabfill.sql
	invenio/legacy/refextract/linker.py
	invenio/legacy/search_engine/__init__.py
	invenio/legacy/webcomment/templates.py
	invenio/legacy/websearch/webcoll.py
	invenio/legacy/websession/session.py
	invenio/legacy/webstat/api.py
	invenio/legacy/webstyle/templates.py
	invenio/legacy/websubmit/file_stamper.py
	invenio/legacy/websubmit/functions/Create_Modify_Interface.py
	invenio/legacy/websubmit/functions/Create_Upload_Files_Interface.py
	invenio/legacy/websubmit/functions/Link_Records.py
	invenio/legacy/websubmit/functions/Shared_Functions.py
	invenio/modules/access/engine.py
	invenio/modules/access/local_config.py
	invenio/modules/comments/api.py
	invenio/modules/formatter/format_elements/bfe_authors.py
	invenio/modules/indexer/tokenizers/BibIndexAuthorCountTokenizer.py
	invenio/modules/indexer/tokenizers/BibIndexDefaultTokenizer.py
	invenio/modules/indexer/tokenizers/BibIndexEmptyTokenizer.py
	invenio/modules/indexer/tokenizers/BibIndexFiletypeTokenizer.py
	invenio/modules/indexer/tokenizers/BibIndexItemCountTokenizer.py
	invenio/modules/indexer/tokenizers/BibIndexJournalTokenizer.py
	invenio/modules/records/testsuite/fields/atlantis.cfg
	invenio/modules/records/testsuite/test_record.py
	invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
	invenio/testsuite/test_utils_text.py
	invenio/utils/autodiscovery/__init__.py
	invenio/utils/crossref.py
	invenio/utils/html.py
	modules/bibfield/lib/Makefile.am
	modules/bibfield/lib/bibfield.py
	modules/bibfield/lib/bibfield_config_engine.py
	modules/bibfield/lib/bibfield_config_engine_unit_tests.py
	modules/bibfield/lib/bibfield_jsonreader.py
	modules/bibfield/lib/bibfield_marcreader.py
	modules/bibfield/lib/bibfield_regression_tests.py
	modules/bibfield/lib/bibfield_utils.py
	modules/bibfield/lib/bibfield_utils_unit_tests.py
	modules/bibfield/lib/functions/get_persistent_identifiers_keys.py
	modules/bibfield/lib/functions/produce_json_for_marc.py
	modules/bibformat/lib/elements/Makefile.am
	modules/bibindex/lib/bibindex_regression_tests.py
	modules/bibrank/lib/bibrank_regression_tests.py
	modules/bibsched/lib/tasklets/Makefile.am
	modules/bibupload/lib/bibupload_regression_tests.py
	modules/docextract/lib/Makefile.am
	modules/docextract/lib/docextract_regression_tests.py
	modules/docextract/lib/refextract_regression_tests.py
	modules/miscutil/lib/Makefile.am
	modules/miscutil/lib/errorlib.py
	modules/miscutil/lib/intbitset.c
	modules/miscutil/lib/intbitset.pyx
	modules/miscutil/lib/intbitset_unit_tests.py
	modules/oairepository/lib/oai_repository_regression_tests.py
	modules/webauthorprofile/lib/Makefile.am
	modules/websearch/lib/Makefile.am
	modules/websearch/lib/websearch_regression_tests.py
	modules/websession/lib/websession_regression_tests.py
	requirements-extras.txt
	requirements.txt