From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 28 May 2018 08:56:14 +0000 (+0100)
Subject: Merge branch 'develop' into features/mchmmer
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=f37c3fd4fe12799de498de5f397252e9f457fee9

Merge branch 'develop' into features/mchmmer

Conflicts:
	src/jalview/bin/Jalview.java
---

f37c3fd4fe12799de498de5f397252e9f457fee9