moved elements from web to root level
Merge with stragegy "ours" to ignore the directory structure changes
Merge branch 'master' into full-tree