add simple web server
:Merge branch 'develop' into feature/simplewebserver
Merge remote-tracking branch 'origin/feature/simplewebserver' into develop