Project compiles for Scala 2.10 and Play 2.1.
Merge branch 'master' of github.com:bphelan/socket.io.play

Conflicts:
	module/app/socketio/SocketIOController.scala