Merge branch 'develop' into bug/JAL-2317_jmol_chimera-chain-factorisation
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 10 Nov 2016 15:57:41 +0000 (15:57 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 10 Nov 2016 15:57:41 +0000 (15:57 +0000)

Trivial merge