Fixing webserver
Merge branch 'master' of github.com:endermann/AngularJsDemo