From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 12 May 2015 10:16:20 +0000 (+0100)
Subject: Merge branch 'features/JAL-1641_JSON_' into develop
X-Git-Tag: Release_2_10_0~682^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=91511e7015e10d7dfbb2345e0b248421fb413adf;p=jalview.git

Merge branch 'features/JAL-1641_JSON_' into develop
---

91511e7015e10d7dfbb2345e0b248421fb413adf