switched to server-side delay
Merge branch 'master' of github.com:bencentra/WebDrink-2.0