Merge branch 'JalviewIntegration' of file:////Users/kjvanderheide/Documents/Archae...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 27 Oct 2017 15:43:24 +0000 (16:43 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 27 Oct 2017 15:43:24 +0000 (16:43 +0100)

Trivial merge