From: kiramt <k.mourao@dundee.ac.uk>
Date: Mon, 24 Apr 2017 13:01:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
X-Git-Tag: Release_2_10_2~3^2~92^2~15
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=14869d2b36336f1fa3e135d83abe64059ad63300

Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
---

14869d2b36336f1fa3e135d83abe64059ad63300