websocket

Signed-off-by: Mikolaj Szabo <savingprivateblue@gmail.com>
Merge branch 'master' of github.com:gawkermedia/pingconf-workshop-demo-app

Conflicts:
	app/controllers/Application.scala

Signed-off-by: Mikolaj Szabo <savingprivateblue@gmail.com>