Merge branch 'trialMergeDev' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 26 Nov 2013 17:03:00 +0000 (17:03 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Tue, 26 Nov 2013 17:03:00 +0000 (17:03 +0000)

Trivial merge