Make static files work
resolve merge conflicts
Make Javascript and Sample static index.html work using webapp folder