Merge branch 'master' into next

Conflicts:
	invenio/ext/email/__init__.py
	invenio/legacy/bibedit/engine.py
	invenio/legacy/bibmerge/engine.py
	invenio/legacy/search_engine/__init__.py
	invenio/legacy/webmessage/api.py
	invenio/legacy/websearch/webinterface.py
	invenio/modules/accounts/templates/accounts/lost_base.html
	invenio/modules/formatter/format_elements/bfe_fulltext_mini.py
	invenio/utils/text.py
	modules/bibformat/lib/elements/Makefile.am
	modules/miscutil/demo/democfgdata.sql
	modules/miscutil/lib/testutils.py
	modules/websearch/lib/websearch_regression_tests.py
	modules/webstyle/lib/goto_engine.py
	modules/websubmit/etc/DEMOART.tpl
	modules/websubmit/etc/DEMOARTcreate.tpl
	modules/websubmit/lib/websubmit_web_tests.py