Webserver shit
Moved index, css, and js to htdocs
Merged some shit
Moved static files to htdocs
Merge branch 'master' into develop
Webserver options
merged upstream removed old test