updated webserver functionality for no more xsr errors
Merge remote-tracking branch 'origin/master'