Merge branch 'bug/JAL-1610refAnnotationsInViews' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 1 Dec 2014 15:40:00 +0000 (15:40 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 1 Dec 2014 15:40:00 +0000 (15:40 +0000)

Trivial merge