Websocket layer
Merge branch 'master' of github.com:gre/beez

Conflicts:
	app/controllers/Application.scala
	conf/routes