Introducing Grunt, better timeout support. Error catching on websockets. Removing webserver dependencies
Changed file location for js files in webui
Changes event
Merge pull request #1 from briandeheus/develop

Various changes