Merge branch 'arimport' into 3.01a-integration

Conflicts:
	bika/lims/browser/client.py
	bika/lims/locales/bika.pot