Merge branch 'master' into next

Conflicts:
	configure.ac
	invenio/legacy/bibrank/adminlib.py
	invenio/legacy/search_engine/__init__.py
	invenio/legacy/websearch/adminlib.py
	invenio/legacy/websearch/templates.py
	invenio/utils/plotextractor/cli.py
	invenio/utils/plotextractor/getter.py
	modules/miscutil/demo/democfgdata.sql
	modules/websearch/doc/hacking/Makefile.am
	modules/websearch/lib/Makefile.am
	modules/websearch/lib/websearch_regression_tests.py
	modules/websearch/lib/websearchadmin_regression_tests.py
	modules/websubmit/lib/functions/Makefile.am