Switch to Faye for messaging
Move to a proper json generation of events
Updated json generation for events

Cleaner and shared between controller/model faye call
Bit of work on admin, faye in its own js
Merge branch 'live' into nicolas

* live:
  Bit of work on admin, faye in its own js
  Updated json generation for events
  Move to a proper json generation of events
  Switch to Faye for messaging

Conflicts:
	Gemfile.lock