minor
Merge branch 'master' of github.com:nodeGame/nodegame-server into messaging_queues

Conflicts:
	public/javascripts/nodegame-full.js
tracking down socket issue
Reliable Messaging