Merge pull request #36 from LIMSforge/development

Development
Release 2 updates
Release 2 updates
Release 2 updates
Merge branch 'development'

Conflicts:
	db/schema.rb
Merge branch 'development'