Added StorageLocation type

Conflicts:
	bika/lims/setupdata/test/test.xlsx

Conflicts:
	bika/lims/locales/af/LC_MESSAGES/bika.po
	bika/lims/locales/af/LC_MESSAGES/plone.po
	bika/lims/locales/bika.pot
	bika/lims/locales/bn/LC_MESSAGES/bika.po
	bika/lims/locales/ca/LC_MESSAGES/bika.po
	bika/lims/locales/ca/LC_MESSAGES/plone.po
	bika/lims/locales/cs/LC_MESSAGES/bika.po
	bika/lims/locales/da_DK/LC_MESSAGES/bika.po
	bika/lims/locales/da_DK/LC_MESSAGES/plone.po
	bika/lims/locales/de/LC_MESSAGES/bika.po
	bika/lims/locales/de/LC_MESSAGES/plone.po
	bika/lims/locales/el/LC_MESSAGES/bika.po
	bika/lims/locales/el/LC_MESSAGES/plone.po
	bika/lims/locales/en/LC_MESSAGES/bika.po
	bika/lims/locales/es/LC_MESSAGES/bika.po
	bika/lims/locales/es/LC_MESSAGES/plone.po
	bika/lims/locales/fr/LC_MESSAGES/bika.po
	bika/lims/locales/fr/LC_MESSAGES/plone.po
	bika/lims/locales/hi/LC_MESSAGES/bika.po
	bika/lims/locales/id/LC_MESSAGES/bika.po
	bika/lims/locales/it/LC_MESSAGES/bika.po
	bika/lims/locales/it/LC_MESSAGES/plone.po
	bika/lims/locales/ja/LC_MESSAGES/bika.po
	bika/lims/locales/kn/LC_MESSAGES/bika.po
	bika/lims/locales/nl/LC_MESSAGES/bika.po
	bika/lims/locales/pl/LC_MESSAGES/bika.po
	bika/lims/locales/pl/LC_MESSAGES/plone.po
	bika/lims/locales/pt/LC_MESSAGES/bika.po
	bika/lims/locales/pt_BR/LC_MESSAGES/bika.po
	bika/lims/locales/pt_BR/LC_MESSAGES/plone.po
	bika/lims/locales/ru/LC_MESSAGES/bika.po
	bika/lims/locales/ta/LC_MESSAGES/bika.po
	bika/lims/locales/uk_UA/LC_MESSAGES/bika.po
	bika/lims/locales/ur/LC_MESSAGES/bika.po
	bika/lims/locales/zh/LC_MESSAGES/bika.po
	bika/lims/locales/zh_CN/LC_MESSAGES/bika.po
	bika/lims/locales/zh_CN/LC_MESSAGES/plone.po
	bika/lims/profiles/default/controlpanel.xml
	bika/lims/profiles/default/cssregistry.xml
	bika/lims/profiles/default/propertiestool.xml
Fixed StorageLocations view
Added storagelocation test
Added storage location to Ar and Sample

Conflicts:
	bika/lims/browser/analysisrequest.py
Fixed conflict
Reran updatelocates.sh
Fixed storage test
removed conflicts left in some files
REmoved getStorageLocation indexes
changed getStorageLocationTitle to getStorageLocation throughout
Removed ClientStorageLocations
Added getter/setter for SL in AR
Removed StorageLocation from registry
Removed transition URLs from inactive and cancel workflows
Fixed update step
Cannot add ARImport outside of client context.
Fixed ARImport issues: Removed Add button on GlobalView, config of CLientView, added SamplingDate on sample creation
Revert "AR import: one may not add a new AR import from global view"

This reverts commit f70ad989b5b593f011eb6e11a350ebb75f2abc70.
Mike fixed in alspec-s4-v2
Revert "ARImport: One may however add an arimport in client context..."

This reverts commit a231741d95593682ec22176104470aa74a5bf6bc.
Mike fixed in alspec-s4-v2
Merge branch 'alspec-s4-v2' into develop