Add faye server
Gemfile changes
Fixed merge conflict