updates following comments from Eugene
Merge branch 'webapp' into gh-pages