Squashed 'Web/' changes from 4354af5..2d27f15

2d27f15 fixed untracked files in basetemplate

git-subtree-dir: Web
git-subtree-split: 2d27f150d9d93d3c7dc2566fac41969d5b4fab6c
Merge commit '01fe8f965c1b380f916176fc3d5d8c040442e094'