Merge branch 'task/JAL-1794_jettyExamplesServer' into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 23 Jul 2015 12:15:59 +0000 (13:15 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 23 Jul 2015 12:15:59 +0000 (13:15 +0100)

Trivial merge