Webserver updated
Merge branch 'master' of https://github.com/prezi/dashboard-controller