Merge branch 'master' of https://github.com/cmzmasek/forester.git into JalviewIntegration
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 26 Oct 2017 09:21:17 +0000 (10:21 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 26 Oct 2017 09:21:17 +0000 (10:21 +0100)

Trivial merge