added websocket support, removed conn.input
Merge branch 'master' of github.com:Dvergar/Anette