Merge branch 'master' of github.com:eikeon/ginger
Fixed errors introduced by websocket commit.