Merge branch 'master' into next

Conflicts:
	.travis.yml
	configure-tests.py
	invenio/modules/formatter/format_elements/bfe_authority_institution.py
	invenio/modules/records/testsuite/fields/atlantis.cfg
	modules/bibauthority/lib/bibauthority_regression_tests.py
	modules/bibfield/lib/bibfield_regression_tests.py
	modules/bibformat/lib/bibformat_regression_tests.py
	modules/bibformat/lib/elements/Makefile.am
	modules/bibformat/lib/elements/bfe_authority_institute.py
	modules/bibformat/lib/elements/bfe_authority_institution.py
	modules/bibupload/lib/bibupload_regression_tests.py
	modules/miscutil/demo/democfgdata.sql
	modules/oaiharvest/lib/oai_harvest_daemon.py
	modules/webauthorprofile/lib/Makefile.am
	modules/webstyle/lib/webdoc_unit_tests.py
	scripts/kwalitee.py