Merge branch 'features/ssFromPDBEntry' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 3 Nov 2014 16:01:56 +0000 (16:01 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 3 Nov 2014 16:01:56 +0000 (16:01 +0000)

Trivial merge