Edited http server
Merge branch 'master' of https://github.com/mkocs/Qi