Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 14 Jan 2015 12:53:54 +0000 (12:53 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 14 Jan 2015 12:53:54 +0000 (12:53 +0000)

Trivial merge