Grid messaging working
Merge remote-tracking branch 'origin/attempt1' into attempt1

Conflicts:
	modules/core/src/main/scala/common/actors/ActorWithSubscribers.scala
	modules/core/src/main/scala/hq/HQCommMsg.scala
	modules/core/src/main/scala/hq/agents/AgentProxyActor.scala
	modules/core/src/main/scala/hq/gates/GateManagerActor.scala
	modules/web/app/actors/WebsocketActor.scala