server is working with successful long-polling!!

bring on the frogs
Merge remote-tracking branch 'origin/master'