Merge branch 'release/3.1' into develop

Conflicts:
	bika/lims/browser/js/bika.lims.loader.js
Merge branch 'develop' of github.com:bikalabs/Bika-LIMS into develop