config change: add new staging areas 52 to 55
Merge pull request #90 from wtsi-npg/master

pull from wtsi master to devel (release 74.14)
Merge pull request #21 from wtsi-npg/devel

pull from wtsi devel to my devel (release 74.14)
authentication through npg own enogmatic.cgi residing relative to where the request comes from; straightforward return in st::api::lims::_sample_description
updated expected result for a live reference retrieval test following a change in the reference genome study field
Merge branch 'devel' of github.com:wtsi-npg/npg_tracking into devel
Merge pull request #89 from dkj/devel

config change: add new staging areas 52 to 55
Merge branch 'devel' of github.com:wtsi-npg/npg_tracking into devel
Merge remote branch 'mg8-remote/devel' into devel

Conflicts:
	Changes
Render links in comments correctly instead of escaping them
Merge pull request #22 from wtsi-npg/devel

Mull changes from wtsi-devel
expended sample shhet generation and parsing
Merge branch 'devel' of github.com:mgcam/npg_tracking into devel
removed prototype samplesheet module; PBP
commented out lines removed from the test
don't bail out on finding no runfolders when FTP'ing to instrument for update info
don't bail out on finding no runfolders when FTP'ing to instrument for update info
Merge branch 'devel2' into devel
Merge pull request #92 from dkj/devel

Render links in comments correctly instead of escaping them
Merge pull request #94 from dkj/devel2

don't bail out on finding no runfolders when FTP'ing to instrument for ...