fix bad merge
Merge branch 'dryad-rest-webapp' into dryad-staging