Merge pull request #35 from LIMSforge/master

Update development with Master
Release 1.5 - Products
Merge pull request #36 from LIMSforge/development

Development