Large changes to web client
Merge branch 'master' of https://github.com/zgthompson/pockwester