Add public folder.
Add faye for pubsub.
Merge remote-tracking branch 'origin/master'