Merge branch 'features/JAL-1740_Decoup-BioJS' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 27 May 2015 16:55:38 +0000 (17:55 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 27 May 2015 16:55:38 +0000 (17:55 +0100)

Trivial merge