Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'uat_release' of github.com:sanger/s2_extraction_pipeline into production
Merge branch 'next_release'
Merge branch 'development' into uat
Adds RNA QC
Remove unused plate attribute from nano update msg
Merge branch 'development' into uat
re-add old rack roles; need to be renamed via API
update qc roles
re-add old rack roles; need to be renamed via API

Conflicts:
	app/scripts/pipeline_config.json
Merge branch 'development' into uat
Updating changes to my local copy.
Merge branch 'focus_bug_fix' of https://github.com/jbeast/s2_extraction_pipeline
Merge branch 'development' into uat
Fix rack display in re-racking
Merge pull request #309 from mattdenner/fix_rack_display_in_reracking

Fix rack display in reracking
Merge branch 'focus_bug_fix' of https://github.com/jbeast/s2_extraction_pipeline into return_key
Merge branch 'development' into uat