remove deprecate files and fix HTML errors/warning
resilve conflict with master
resolve GIT conflict