Merge branch 'JAL-1400_sandboxapp' into Release_2_8_Branch
authorjprocter <jprocter@dundee.ac.uk>
Fri, 17 Jan 2014 16:39:47 +0000 (16:39 +0000)
committerjprocter <jprocter@dundee.ac.uk>
Fri, 17 Jan 2014 16:39:47 +0000 (16:39 +0000)

Trivial merge