Conflicts:
web/html/actions/updates.php
web/html/alternative.css
web/html/contact.html
web/html/documentation.html
web/html/download.html
web/html/features.html
web/html/getinvolved.html
web/html/index.html
web/html/layout.css
web/html/license.html
web/html/report.html
web/htp/body.htt
web/htp/contact.htp
web/htp/documentation.htp
web/htp/download.htp
web/htp/htp.def
web/htp/index.htp
web/htp/news.htp