Adds ESDM to list of templates in menu creation
Removes laboratory barcode field
Merge branch 'development' into uat