fixed web.js so static files could be servered
Merge branch 'develop' into staging
Merge branch 'staging'